Skip to content

Commit d91dc28

Browse files
committed
---
yaml --- r: 142923 b: refs/heads/try2 c: 4bf6b84 h: refs/heads/master i: 142921: c455dd5 142919: a5324c8 v: v3
1 parent 65ba74a commit d91dc28

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 8e58a272cc440ed90b15043125138e8f1aabba98
8+
refs/heads/try2: 4bf6b84a4d23606394fb7176b4f2f216dff06e5b
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/tests.mk

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

37+
CTEST_BENCH = --bench
38+
3739
# Arguments to the cfail/rfail/rpass/bench tests
3840
ifdef CFG_VALGRIND
3941
CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
42+
CTEST_BENCH =
4043
endif
4144

4245
# Arguments to the perf tests
@@ -66,12 +69,12 @@ TEST_RATCHET_NOISE_PERCENT=10.0
6669
# Whether to ratchet or merely save benchmarks
6770
ifdef CFG_RATCHET_BENCH
6871
CRATE_TEST_BENCH_ARGS=\
69-
--test --bench \
72+
--test $(CTEST_BENCH) \
7073
--ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \
7174
--ratchet-noise-percent $(TEST_RATCHET_NOISE_PERCENT)
7275
else
7376
CRATE_TEST_BENCH_ARGS=\
74-
--test --bench \
77+
--test $(CTEST_BENCH) \
7578
--save-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4))
7679
endif
7780

0 commit comments

Comments
 (0)