From ac2cd14867f2f6d9d2c9055dfd6585ab04c08f03 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 29 Jul 2013 12:38:12 -0700
Subject: [PATCH 1/2] mk: Rename CTEST_BENCH to TEST_BENCH

The CTEST prefix is specifically related to the compiletest driver
---
 mk/tests.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mk/tests.mk b/mk/tests.mk
index 9e0ccb5dbee..6b35cbdaf77 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -34,12 +34,12 @@ 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
 
 # Arguments to the perf tests
@@ -69,12 +69,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
 

From ceba95ced2ecd5f64eae6c8db5ae314b8b1b8822 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 29 Jul 2013 12:43:45 -0700
Subject: [PATCH 2/2] mk: Add NO_BENCH variable for turning off the --bench
 flag

---
 mk/tests.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mk/tests.mk b/mk/tests.mk
index 6b35cbdaf77..5e6879fb412 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -42,6 +42,10 @@ ifdef CFG_VALGRIND
   TEST_BENCH =
 endif
 
+ifdef NO_BENCH
+  TEST_BENCH =
+endif
+
 # Arguments to the perf tests
 ifdef CFG_PERF_TOOL
   CTEST_PERF_RUNTOOL = --runtool "$(CFG_PERF_TOOL)"