Bug 635155 - Get full JIT-tests coverage back. r=dmandelin, a=beltzner/npotb.

This commit is contained in:
Nicholas Nethercote 2011-02-28 16:17:05 -08:00
parent 20129f0e9f
commit e3ce73e36f
2 changed files with 6 additions and 3 deletions

View File

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

View File

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