Skip to content

Commit 1e3e5fa

Browse files
committed
---
yaml --- r: 64893 b: refs/heads/snap-stage3 c: 38d62fe h: refs/heads/master i: 64891: 8466d89 v: v3
1 parent caa99c6 commit 1e3e5fa

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 5633a5363b6c650500b8b6496ddd49ea8c698f92
4+
refs/heads/snap-stage3: 38d62feec1e65ba5ed57235355053782ca15b5ff
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/tests.mk

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,16 @@ ifdef CHECK_XFAILS
3434
TESTARGS += --ignored
3535
endif
3636

37-
CTEST_BENCH = --bench
37+
TEST_BENCH = --bench
3838

3939
# Arguments to the cfail/rfail/rpass/bench tests
4040
ifdef CFG_VALGRIND
4141
CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
42-
CTEST_BENCH =
42+
TEST_BENCH =
43+
endif
44+
45+
ifdef NO_BENCH
46+
TEST_BENCH =
4347
endif
4448

4549
# Arguments to the perf tests
@@ -69,12 +73,12 @@ TEST_RATCHET_NOISE_PERCENT=10.0
6973
# Whether to ratchet or merely save benchmarks
7074
ifdef CFG_RATCHET_BENCH
7175
CRATE_TEST_BENCH_ARGS=\
72-
--test $(CTEST_BENCH) \
76+
--test $(TEST_BENCH) \
7377
--ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \
7478
--ratchet-noise-percent $(TEST_RATCHET_NOISE_PERCENT)
7579
else
7680
CRATE_TEST_BENCH_ARGS=\
77-
--test $(CTEST_BENCH) \
81+
--test $(TEST_BENCH) \
7882
--save-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4))
7983
endif
8084

0 commit comments

Comments
 (0)