Bug 635155 - Get full JIT-tests coverage back. r=dmandelin, a=beltzner/npotb.
authorNicholas Nethercote <nnethercote@mozilla.com>
Mon, 28 Feb 2011 16:17:05 -0800
changeset 63238 f85299200bd392f06277e0875d50c8e4727edd72
parent 63237 f1e0fac5d508ea023ba9245ad9266b06fb50e5e3
child 63239 4d16463b0655a7663acb8af214f08e2876c9454c
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmandelin, beltzner, npotb
bugs635155
milestone2.0b13pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 635155 - Get full JIT-tests coverage back. r=dmandelin, a=beltzner/npotb.
js/src/Makefile.in
js/src/jit-test/jit_test.py
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -578,23 +578,24 @@ endif
 # creep in.
 ifeq ($(OS_ARCH),Linux)
 check::
 	$(srcdir)/config/find_vanilla_new_calls $(LIBRARY)
 endif
 
 ifdef ENABLE_TRACEJIT
 ifndef WINCE
+JITFLAGS = ,m,j,mj,mjp,am,amj,amjp,amd
 check::
 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/jit-test/jit_test.py \
-	        --no-slow --no-progress --tinderbox --jitflags=m,j,mj,mjp,mjd $(DIST)/bin/js$(BIN_SUFFIX)
+	        --no-slow --no-progress --tinderbox --jitflags=$(JITFLAGS) $(DIST)/bin/js$(BIN_SUFFIX)
 
 check-valgrind::
 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/jit-test/jit_test.py \
-	        --valgrind --no-slow --no-progress --tinderbox --jitflags=m,j,mj,mjp,mjd $(DIST)/bin/js$(BIN_SUFFIX)
+	        --valgrind --no-slow --no-progress --tinderbox --jitflags=$(JITFLAGS) $(DIST)/bin/js$(BIN_SUFFIX)
 endif
 endif
 
 DIST_GARBAGE = config.cache config.log config.status \
    config/autoconf.mk \
    unallmakefiles js-config js-config.h js-confdefs.h
 
 distclean::
--- a/js/src/jit-test/jit_test.py
+++ b/js/src/jit-test/jit_test.py
@@ -122,17 +122,19 @@ def find_tests(dir, substring = None):
                 ans.append(test)
     return ans
 
 def get_test_cmd(path, jitflags, lib_dir):
     libdir_var = lib_dir
     if not libdir_var.endswith('/'):
         libdir_var += '/'
     expr = "const platform=%r; const libdir=%r;"%(sys.platform, libdir_var)
-    return [ JS ] + jitflags + [ '-e', expr, '-f', os.path.join(lib_dir, 'prolog.js'),
+    # We may have specified '-a' or '-d' twice: once via --jitflags, once
+    # via the "|jit-test|" line.  Remove dups because they are toggles.
+    return [ JS ] + list(set(jitflags)) + [ '-e', expr, '-f', os.path.join(lib_dir, 'prolog.js'),
              '-f', path ]
 
 def run_cmd(cmdline, env):
     # close_fds is not supported on Windows and will cause a ValueError.
     close_fds = sys.platform != 'win32'
     p = Popen(cmdline, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=close_fds, env=env)
     out, err = p.communicate()
     return out.decode(), err.decode(), p.returncode