diff options
| author | bors <bors@rust-lang.org> | 2013-07-30 20:46:18 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-30 20:46:18 -0700 |
| commit | 38d62feec1e65ba5ed57235355053782ca15b5ff (patch) | |
| tree | c334f04b3fbc278e1e6abf8ec10bb9f9214795a8 | |
| parent | 5633a5363b6c650500b8b6496ddd49ea8c698f92 (diff) | |
| parent | ceba95ced2ecd5f64eae6c8db5ae314b8b1b8822 (diff) | |
| download | rust-38d62feec1e65ba5ed57235355053782ca15b5ff.tar.gz rust-38d62feec1e65ba5ed57235355053782ca15b5ff.zip | |
auto merge of #8111 : brson/rust/no-bench, r=graydon
| -rw-r--r-- | mk/tests.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mk/tests.mk b/mk/tests.mk index 4fab9f69c86..048dc56597a 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -34,12 +34,16 @@ ifdef CHECK_XFAILS TESTARGS += --ignored endif -CTEST_BENCH = --bench +TEST_BENCH = --bench # Arguments to the cfail/rfail/rpass/bench tests ifdef CFG_VALGRIND CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)" - CTEST_BENCH = + TEST_BENCH = +endif + +ifdef NO_BENCH + TEST_BENCH = endif # Arguments to the perf tests @@ -69,12 +73,12 @@ TEST_RATCHET_NOISE_PERCENT=10.0 # Whether to ratchet or merely save benchmarks ifdef CFG_RATCHET_BENCH CRATE_TEST_BENCH_ARGS=\ - --test $(CTEST_BENCH) \ + --test $(TEST_BENCH) \ --ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \ --ratchet-noise-percent $(TEST_RATCHET_NOISE_PERCENT) else CRATE_TEST_BENCH_ARGS=\ - --test $(CTEST_BENCH) \ + --test $(TEST_BENCH) \ --save-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) endif |