auto merge of rust-lang#8111 : brson/rust/no-bench, r=graydon

dobkeratops · Jul 31, 2013 · 38d62fe · 38d62fe
2 parents 5633a53 + ceba95c
commit 38d62fe
Showing 1 changed file with 8 additions and 4 deletions.
diff --git 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