Bug 1161410 - Part 2: Use --jitflags instead of --tbpl and --tbpl-debug. r=sfink
authorTooru Fujisawa <arai_a@mac.com>
Fri, 08 May 2015 00:28:55 +0900
changeset 242822 f075bcb8c60b40cf12be0b83ad3178313d00b1ec
parent 242821 587ad4afaeb9cf29287707ef5a0fe5ae45d07d4b
child 242823 98a6cb62aeff1381d235673f0b63da27c1757614
push id28713
push userkwierso@gmail.com
push dateFri, 08 May 2015 17:06:43 +0000
treeherdermozilla-central@fd5e9b7eec13 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfink
bugs1161410
milestone40.0a1
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 1161410 - Part 2: Use --jitflags instead of --tbpl and --tbpl-debug. r=sfink
js/src/Makefile.in
js/src/devtools/automation/autospider.sh
testing/config/mozharness/android_panda_config.py
testing/config/mozharness/linux_config.py
testing/config/mozharness/mac_config.py
testing/config/mozharness/taskcluster_linux_config.py
testing/config/mozharness/windows_config.py
testing/mach_commands.py
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -129,17 +129,17 @@ JITTEST_ASAN_ENV=ASAN_SYMBOLIZER_PATH='$
 endif
 endif
 
 check-style::
 	(cd $(srcdir) && $(PYTHON) $(topsrcdir)/config/check_spidermonkey_style.py);
 
 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)
 
 check:: check-style
 
 check-jstests:
 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/tests/jstests.py \
--- a/js/src/devtools/automation/autospider.sh
+++ b/js/src/devtools/automation/autospider.sh
@@ -174,21 +174,21 @@ elif [[ "$VARIANT" = "compacting" ]]; th
     win*)
         RUN_JSTESTS=false
     esac
 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
 $COMMAND_PREFIX $MAKE check-jit-test || exit 1
 $COMMAND_PREFIX $OBJDIR/dist/bin/jsapi-tests || exit 1
 if $RUN_JSTESTS; then
     $COMMAND_PREFIX $MAKE check-jstests || exit 1
 fi
--- a/testing/config/mozharness/android_panda_config.py
+++ b/testing/config/mozharness/android_panda_config.py
@@ -40,17 +40,17 @@ config = {
                 "-j",
                 "1",
                 "--deviceTransport=sut",
                 "--deviceIP=%(device_ip)s",
                 "--localLib=../tests/bin",
                 "--no-slow",
                 "--no-progress",
                 "--tinderbox",
-                "--tbpl"
+                "--jitflags=all"
             ],
             "run_filename": "jit_test.py",
             "testsdir": "jit-test/jit-test"
         },
         "jsreftest": {
             "options": [
                 "--deviceIP=%(device_ip)s",
                 "--xre-path=../hostutils/xre",
--- a/testing/config/mozharness/linux_config.py
+++ b/testing/config/mozharness/linux_config.py
@@ -13,17 +13,17 @@ config = {
             "testsdir": "cppunittests"
         },
         "jittest": {
             "options": [
                 "tests/bin/js",
                 "--no-slow",
                 "--no-progress",
                 "--tinderbox",
-                "--tbpl"
+                "--jitflags=all"
             ],
             "run_filename": "jit_test.py",
             "testsdir": "jit-test/jit-test"
         },
         "mochitest": {
             "options": [
                 "--appname=%(binary_path)s",
                 "--utility-path=tests/bin",
--- a/testing/config/mozharness/mac_config.py
+++ b/testing/config/mozharness/mac_config.py
@@ -13,17 +13,17 @@ config = {
             "testsdir": "cppunittests"
         },
         "jittest": {
             "options": [
                 "tests/bin/js",
                 "--no-slow",
                 "--no-progress",
                 "--tinderbox",
-                "--tbpl"
+                "--jitflags=all"
             ],
             "run_filename": "jit_test.py",
             "testsdir": "jit-test/jit-test"
         },
         "mochitest": {
             "options": [
                 "--appname=%(binary_path)s",
                 "--utility-path=tests/bin",
--- a/testing/config/mozharness/taskcluster_linux_config.py
+++ b/testing/config/mozharness/taskcluster_linux_config.py
@@ -28,14 +28,14 @@ config = {
         "--symbols-path=%(symbols_path)s",
         "--xre-path=%(abs_app_dir)s"
     ],
     "jittest_options": [
         "tests/bin/js",
         "--no-slow",
         "--no-progress",
         "--tinderbox",
-        "--tbpl"
+        "--jitflags=all"
     ],
     "mozbase_options": [
         "-b", "%(binary_path)s"
     ],
 }
--- a/testing/config/mozharness/windows_config.py
+++ b/testing/config/mozharness/windows_config.py
@@ -13,17 +13,17 @@ config = {
             "testsdir": "cppunittests"
         },
         "jittest": {
             "options": [
                 "tests/bin/js",
                 "--no-slow",
                 "--no-progress",
                 "--tinderbox",
-                "--tbpl"
+                "--jitflags=all"
             ],
             "run_filename": "jit_test.py",
             "testsdir": "jit-test/jit-test"
         },
         "mochitest": {
             "options": [
                 "--appname=%(binary_path)s",
                 "--utility-path=tests/bin",
--- a/testing/mach_commands.py
+++ b/testing/mach_commands.py
@@ -301,25 +301,25 @@ class CheckSpiderMonkeyCommand(MachComma
         bin_suffix = ''
         if sys.platform.startswith('win'):
             bin_suffix = '.exe'
 
         js = os.path.join(self.bindir, 'js%s' % bin_suffix)
 
         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')
 
         jittest_result = subprocess.call(jittest_cmd)
 
         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')
         jsapi_tests_cmd = [os.path.join(self.bindir, 'jsapi-tests%s' % bin_suffix)]
         jsapi_tests_result = subprocess.call(jsapi_tests_cmd)
 
         print('running check-style')
         check_style_cmd = [sys.executable, os.path.join(self.topsrcdir, 'config', 'check_spidermonkey_style.py')]