Bug 1286725 - Do not add wasm-baseline variants when interpreter-only is requested, r=terrence
authorSteve Fink <sfink@mozilla.com>
Wed, 13 Jul 2016 18:45:10 -0700
changeset 305620 09a1881a4f7e9cccb2579487549840dbaf5b2d3d
parent 305619 89192956a41a5fe1f962e29352ed0fb5b0f3298e
child 305621 d3f29964daf8ce4d1c2a63c79053517f4f459f86
push id20064
push usercbook@mozilla.com
push dateWed, 20 Jul 2016 09:28:23 +0000
treeherderfx-team@e904e18d7dfc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence
bugs1286725
milestone50.0a1
Bug 1286725 - Do not add wasm-baseline variants when interpreter-only is requested, r=terrence MozReview-Commit-ID: HbtAbaDKrgs
js/src/jit-test/jit_test.py
--- a/js/src/jit-test/jit_test.py
+++ b/js/src/jit-test/jit_test.py
@@ -189,18 +189,26 @@ def main(argv):
     if options.retest:
         options.read_tests = options.retest
         options.write_failures = options.retest
 
     test_list = []
     read_all = True
 
     # Forbid running several variants of the same asmjs test, when debugging.
-    options.can_test_also_noasmjs = not options.debugger
-    options.can_test_also_wasm_baseline = not options.debugger
+    # But also, no point in adding in noasmjs and wasm-baseline variants if the
+    # jitflags forbid asmjs in the first place. (This is to avoid getting a
+    # wasm-baseline run when requesting --jitflags=interp, but the test
+    # contains test-also-noasmjs.)
+    test_flags = get_jitflags(options.jitflags)
+    options.can_test_also_noasmjs = True
+    options.can_test_also_wasm_baseline = True
+    if options.debugger or all(['--no-asmjs' in flags for flags in test_flags]):
+        options.can_test_also_noasmjs = False
+        options.can_test_also_wasm_baseline = False
 
     if test_args:
         read_all = False
         for arg in test_args:
             test_list += jittests.find_tests(arg)
 
     if options.read_tests:
         read_all = False
@@ -253,18 +261,16 @@ def main(argv):
         test_list = test_list[start:end]
 
     if not test_list:
         print("No tests found matching command line arguments after filtering.",
               file=sys.stderr)
         sys.exit(0)
 
     # The full test list is ready. Now create copies for each JIT configuration.
-    test_flags = get_jitflags(options.jitflags)
-
     test_list = [_ for test in test_list for _ in test.copy_variants(test_flags)]
 
     job_list = (test for test in test_list)
     job_count = len(test_list)
 
     if options.repeat:
         job_list = (test for test in job_list for i in range(options.repeat))
         job_count *= options.repeat