auto merge of #8111 : brson/rust/no-bench, r=graydon
This commit is contained in:
commit
38d62feec1
12
mk/tests.mk
12
mk/tests.mk
|
@ -34,12 +34,16 @@ ifdef CHECK_XFAILS
|
||||||
TESTARGS += --ignored
|
TESTARGS += --ignored
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CTEST_BENCH = --bench
|
TEST_BENCH = --bench
|
||||||
|
|
||||||
# Arguments to the cfail/rfail/rpass/bench tests
|
# Arguments to the cfail/rfail/rpass/bench tests
|
||||||
ifdef CFG_VALGRIND
|
ifdef CFG_VALGRIND
|
||||||
CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
|
CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
|
||||||
CTEST_BENCH =
|
TEST_BENCH =
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef NO_BENCH
|
||||||
|
TEST_BENCH =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Arguments to the perf tests
|
# Arguments to the perf tests
|
||||||
|
@ -69,12 +73,12 @@ TEST_RATCHET_NOISE_PERCENT=10.0
|
||||||
# Whether to ratchet or merely save benchmarks
|
# Whether to ratchet or merely save benchmarks
|
||||||
ifdef CFG_RATCHET_BENCH
|
ifdef CFG_RATCHET_BENCH
|
||||||
CRATE_TEST_BENCH_ARGS=\
|
CRATE_TEST_BENCH_ARGS=\
|
||||||
--test $(CTEST_BENCH) \
|
--test $(TEST_BENCH) \
|
||||||
--ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \
|
--ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \
|
||||||
--ratchet-noise-percent $(TEST_RATCHET_NOISE_PERCENT)
|
--ratchet-noise-percent $(TEST_RATCHET_NOISE_PERCENT)
|
||||||
else
|
else
|
||||||
CRATE_TEST_BENCH_ARGS=\
|
CRATE_TEST_BENCH_ARGS=\
|
||||||
--test $(CTEST_BENCH) \
|
--test $(TEST_BENCH) \
|
||||||
--save-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4))
|
--save-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue