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

@@ -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
 

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@