Bug 1495611 - Part 2: Apply cgc-jittest-timeouts.txt to binast directory. r=Yoric
☠☠ backed out by cb526a4489cb ☠ ☠
authorTooru Fujisawa <arai_a@mac.com>
Fri, 18 Jan 2019 04:55:05 +0000
changeset 514409 0baeacb1800bf679c21a15f2aaab01296d99f43e
parent 514408 da5caa27480c7b10fd4a279b3d505dcb693853aa
child 514410 a5e61a18508db155990bba50a694cf67f17bc004
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersYoric
bugs1495611
milestone66.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 1495611 - Part 2: Apply cgc-jittest-timeouts.txt to binast directory. r=Yoric Differential Revision: https://phabricator.services.mozilla.com/D16809
js/src/jit-test/jit_test.py
--- a/js/src/jit-test/jit_test.py
+++ b/js/src/jit-test/jit_test.py
@@ -322,18 +322,26 @@ def main(argv):
     if options.repeat:
         job_list = (test for test in job_list for i in range(options.repeat))
         job_count *= options.repeat
 
     if options.ignore_timeouts:
         read_all = False
         try:
             with open(options.ignore_timeouts) as f:
-                options.ignore_timeouts = set(
-                    [line.strip('\n') for line in f.readlines()])
+                ignore = set()
+                for line in f.readlines():
+                    path = line.strip('\n')
+                    ignore.add(path)
+
+                    binjs_path = path.replace('.js', '.binjs')
+                    # Do not use os.path.join to always use '/'.
+                    ignore.add('binast/nonlazy/{}'.format(binjs_path))
+                    ignore.add('binast/lazy/{}'.format(binjs_path))
+                options.ignore_timeouts = ignore
         except IOError:
             sys.exit("Error reading file: " + options.ignore_timeouts)
     else:
         options.ignore_timeouts = set()
 
     prefix = [js_shell] + shlex.split(options.shell_args)
     prologue = os.path.join(jittests.LIB_DIR, 'prologue.js')
     if options.remote: