From c8fb83afe6e0499e2448db06e23ca623563842d4 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Mon, 28 Feb 2011 16:17:05 -0800 Subject: [PATCH] Bug 635155 - Get full JIT-tests coverage back. r=dmandelin, a=beltzner/npotb. --- js/src/Makefile.in | 5 +++-- js/src/jit-test/jit_test.py | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/js/src/Makefile.in b/js/src/Makefile.in index b4eec90db5fa..fadd85077f87 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -583,13 +583,14 @@ 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 diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py index 69f1c104c909..fc27a2344e3e 100755 --- a/js/src/jit-test/jit_test.py +++ b/js/src/jit-test/jit_test.py @@ -127,7 +127,9 @@ def get_test_cmd(path, jitflags, 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):