From 5d9bfcbdc4199505b83514c8641298c56bee5ac2 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Thu, 3 May 2012 14:36:11 -0500
Subject: [PATCH] Only run jit-tests under valgrind if we built the JS engine
 with valgrind.h. Bug 725733, r=jimb.

--HG--
extra : rebase_source : 06d41845a5f16a05e2483cbfaa254fda5d343c98
---
 js/src/Makefile.in           | 7 +++++--
 js/src/config/autoconf.mk.in | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index fbe1ff05b48..20cc75e2796 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -609,14 +609,17 @@ ifneq ($(OS_ARCH),WINNT) # FIXME: this should be made work on Windows too.
 #check:: check-malloc-function-usage FIXME: disable on JM until closer to merge time.
 endif
 
+ifdef MOZ_VALGRIND
 ifndef MOZ_ASAN
-JITTESTPARAMS="--valgrind"
+JITTEST_VALGRIND_FLAG = --valgrind
+endif
 endif
 
 JITFLAGS = ,m,am,amd,n,mn,amn,amdn,mdn
 check-jit-test::
 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/jit-test/jit_test.py \
-	        --no-slow --no-progress --tinderbox --jitflags=$(JITFLAGS) $(JITTESTPARAMS) $(DIST)/bin/js$(BIN_SUFFIX)
+	        --no-slow --no-progress --tinderbox --jitflags=$(JITFLAGS) $(JITTEST_VALGRIND_FLAG) \
+	        $(DIST)/bin/js$(BIN_SUFFIX)
 
 check:: check-jit-test
 
diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index 528b09690c3..0af49d2d802 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -86,6 +86,7 @@ MOZ_MEMORY      = @MOZ_MEMORY@
 MOZ_PROFILING   = @MOZ_PROFILING@
 MOZ_JPROF       = @MOZ_JPROF@
 MOZ_SHARK       = @MOZ_SHARK@
+MOZ_VALGRIND    = @MOZ_VALGRIND@
 MOZ_CALLGRIND   = @MOZ_CALLGRIND@
 MOZ_VTUNE       = @MOZ_VTUNE@
 MOZ_ETW       = @MOZ_ETW@