Bug 1163020 - Fix --jitflags=none or no --jitflags in jit_test.py. r=terrence
authorTooru Fujisawa <arai_a@mac.com>
Sat, 09 May 2015 04:01:03 +0900
changeset 243049 d732da9298fabae4350466e7817f634afa283cb9
parent 243048 0cc4812a1cd79fb4dbd0c20360541d7ba416b813
child 243050 3d43ed34435515e4fd18937281f882bd8f4a431a
push id59570
push userarai_a@mac.com
push dateFri, 08 May 2015 19:01:57 +0000
treeherdermozilla-inbound@d732da9298fa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence
bugs1163020
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 1163020 - Fix --jitflags=none or no --jitflags in jit_test.py. r=terrence
js/src/tests/jstests.py
js/src/tests/lib/tests.py
--- a/js/src/tests/jstests.py
+++ b/js/src/tests/jstests.py
@@ -280,17 +280,17 @@ def load_tests(options, requested_paths,
 
     # Create a new test list. Apply each TBPL configuration to every test.
     flags_list = None
     if options.tbpl:
         flags_list = get_jitflags('all')
     elif options.tbpl_debug:
         flags_list = get_jitflags('debug')
     else:
-        flags_list = get_jitflags(options.jitflags)
+        flags_list = get_jitflags(options.jitflags, none=None)
 
     if flags_list:
         new_test_list = []
         for test in test_list:
             for jitflags in flags_list:
                 tmp_test = copy(test)
                 tmp_test.jitflags = copy(test.jitflags)
                 tmp_test.jitflags.extend(jitflags)
--- a/js/src/tests/lib/tests.py
+++ b/js/src/tests/lib/tests.py
@@ -27,23 +27,27 @@ JITFLAGS = {
         ['--ion-eager', '--ion-offthread-compile=off']
     ],
     # Run reduced variants on debug builds, since they take longer time.
     'debug': [
         [], # no flags, normal baseline and ion
         ['--ion-eager', '--ion-offthread-compile=off'], # implies --baseline-eager
         ['--baseline-eager'],
     ],
-    'none': []
+    'none': [
+        [] # no flags, normal baseline and ion
+    ]
 }
 
-def get_jitflags(variant):
+def get_jitflags(variant, **kwargs):
     if variant not in JITFLAGS:
         print('Invalid jitflag: "{}"'.format(variant))
         sys.exit(1)
+    if variant == 'none' and 'none' in kwargs:
+        return kwargs['none']
     return JITFLAGS[variant]
 
 def do_run_cmd(cmd):
     l = [None, None]
     th_run_cmd(cmd, l)
     return l[1]
 
 def set_limits():