Bug 1391237 - backslashes in test.relpath_tests should be replaced with slash before checking against options.ignore_timeouts, in jittests.py. r=arai draft
authorJustin Wood <Callek@gmail.com>
Thu, 17 Aug 2017 13:44:29 -0400
changeset 648391 33ef511586c503eb8babbd27d31ce02faf1bb39c
parent 647817 63ca686c3f1e870649b6d9c559973d100573aec2
child 648392 534e404788834203e6c4c2dd6bc5d6fec02030fe
child 649335 e9135f322ecd51d43816863c53872ae22d27aa6c
child 649337 19ed07d03865a51b33458844fae62605d50d76ad
push id74747
push userCallek@gmail.com
push dateThu, 17 Aug 2017 18:46:06 +0000
reviewersarai
bugs1391237
milestone57.0a1
Bug 1391237 - backslashes in test.relpath_tests should be replaced with slash before checking against options.ignore_timeouts, in jittests.py. r=arai MozReview-Commit-ID: ByE4NM8tFA0
js/src/tests/lib/jittests.py
--- a/js/src/tests/lib/jittests.py
+++ b/js/src/tests/lib/jittests.py
@@ -377,17 +377,18 @@ def run_test_remote(test, device, prefix
 
     out = buf.getvalue()
     # We can't distinguish between stdout and stderr so we pass
     # the same buffer to both.
     return TestOutput(test, cmd, out, out, returncode, None, False)
 
 def check_output(out, err, rc, timed_out, test, options):
     if timed_out:
-        if test.relpath_tests in options.ignore_timeouts:
+        if os.path.normpath(test.relpath_tests).replace(os.sep, '/') \
+                in options.ignore_timeouts:
             return True
 
         # The shell sometimes hangs on shutdown on Windows 7 and Windows
         # Server 2008. See bug 970063 comment 7 for a description of the
         # problem. Until bug 956899 is fixed, ignore timeouts on these
         # platforms (versions 6.0 and 6.1).
         if sys.platform == 'win32':
             ver = sys.getwindowsversion()