From 14c5f9c7c7c357c482a8ca537950929c2a8abd3b Mon Sep 17 00:00:00 2001 From: Tooru Fujisawa Date: Fri, 8 May 2015 00:28:55 +0900 Subject: [PATCH] Bug 1161410 - Part 2: Use --jitflags instead of --tbpl and --tbpl-debug. r=sfink --- js/src/Makefile.in | 2 +- js/src/devtools/automation/autospider.sh | 4 ++-- testing/config/mozharness/android_panda_config.py | 2 +- testing/config/mozharness/linux_config.py | 2 +- testing/config/mozharness/mac_config.py | 2 +- testing/config/mozharness/taskcluster_linux_config.py | 2 +- testing/config/mozharness/windows_config.py | 2 +- testing/mach_commands.py | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 5ab3dc676a8..5343c1e6f07 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -134,7 +134,7 @@ check-style:: check-jit-test:: $(JITTEST_ASAN_ENV) $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/jit-test/jit_test.py \ - --no-slow --no-progress --tinderbox --tbpl \ + --no-slow --no-progress --tinderbox --jitflags=all \ $(JITTEST_VALGRIND_FLAG) \ $(JITTEST_EXTRA_ARGS) \ $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX) diff --git a/js/src/devtools/automation/autospider.sh b/js/src/devtools/automation/autospider.sh index 9404a4153d3..105f8e2e446 100755 --- a/js/src/devtools/automation/autospider.sh +++ b/js/src/devtools/automation/autospider.sh @@ -179,11 +179,11 @@ fi if [[ "$VARIANT" = "warnaserr" || "$VARIANT" = "warnaserrdebug" || "$VARIANT" = "plain" ]]; then - export JSTESTS_EXTRA_ARGS=--tbpl + export JSTESTS_EXTRA_ARGS=--jitflags=all elif [[ "$VARIANT" = "arm-sim" || "$VARIANT" = "rootanalysis" || "$VARIANT" = "plaindebug" ]]; then - export JSTESTS_EXTRA_ARGS=--tbpl-debug + export JSTESTS_EXTRA_ARGS=--jitflags=debug fi $COMMAND_PREFIX $MAKE check || exit 1 diff --git a/testing/config/mozharness/android_panda_config.py b/testing/config/mozharness/android_panda_config.py index 5a21666ad92..931fce093b5 100644 --- a/testing/config/mozharness/android_panda_config.py +++ b/testing/config/mozharness/android_panda_config.py @@ -45,7 +45,7 @@ config = { "--no-slow", "--no-progress", "--tinderbox", - "--tbpl" + "--jitflags=all" ], "run_filename": "jit_test.py", "testsdir": "jit-test/jit-test" diff --git a/testing/config/mozharness/linux_config.py b/testing/config/mozharness/linux_config.py index b0253001d4c..e6b2c62397a 100644 --- a/testing/config/mozharness/linux_config.py +++ b/testing/config/mozharness/linux_config.py @@ -18,7 +18,7 @@ config = { "--no-slow", "--no-progress", "--tinderbox", - "--tbpl" + "--jitflags=all" ], "run_filename": "jit_test.py", "testsdir": "jit-test/jit-test" diff --git a/testing/config/mozharness/mac_config.py b/testing/config/mozharness/mac_config.py index 9811d93b931..5f0180f6ea9 100644 --- a/testing/config/mozharness/mac_config.py +++ b/testing/config/mozharness/mac_config.py @@ -18,7 +18,7 @@ config = { "--no-slow", "--no-progress", "--tinderbox", - "--tbpl" + "--jitflags=all" ], "run_filename": "jit_test.py", "testsdir": "jit-test/jit-test" diff --git a/testing/config/mozharness/taskcluster_linux_config.py b/testing/config/mozharness/taskcluster_linux_config.py index 753a9c301b3..3805264b45e 100644 --- a/testing/config/mozharness/taskcluster_linux_config.py +++ b/testing/config/mozharness/taskcluster_linux_config.py @@ -33,7 +33,7 @@ config = { "--no-slow", "--no-progress", "--tinderbox", - "--tbpl" + "--jitflags=all" ], "mozbase_options": [ "-b", "%(binary_path)s" diff --git a/testing/config/mozharness/windows_config.py b/testing/config/mozharness/windows_config.py index 9811d93b931..5f0180f6ea9 100644 --- a/testing/config/mozharness/windows_config.py +++ b/testing/config/mozharness/windows_config.py @@ -18,7 +18,7 @@ config = { "--no-slow", "--no-progress", "--tinderbox", - "--tbpl" + "--jitflags=all" ], "run_filename": "jit_test.py", "testsdir": "jit-test/jit-test" diff --git a/testing/mach_commands.py b/testing/mach_commands.py index 5dd9ad1a51f..f6759b16ee0 100644 --- a/testing/mach_commands.py +++ b/testing/mach_commands.py @@ -306,7 +306,7 @@ class CheckSpiderMonkeyCommand(MachCommandBase): print('Running jit-tests') jittest_cmd = [os.path.join(self.topsrcdir, 'js', 'src', 'jit-test', 'jit_test.py'), - js, '--no-slow', '--tbpl'] + js, '--no-slow', '--jitflags=all'] if params['valgrind']: jittest_cmd.append('--valgrind') @@ -314,7 +314,7 @@ class CheckSpiderMonkeyCommand(MachCommandBase): print('running jstests') jstest_cmd = [os.path.join(self.topsrcdir, 'js', 'src', 'tests', 'jstests.py'), - js, '--tbpl'] + js, '--jitflags=all'] jstest_result = subprocess.call(jstest_cmd) print('running jsapi-tests')