Bug 1391237 - backslashes in test.relpath_tests should be replaced with slash before checking against options.ignore_timeouts, in jittests.py. r=arai
authorJustin Wood <Callek@gmail.com>
Thu, 17 Aug 2017 13:44:29 -0400
changeset 425230 feeb0ffdce8cd862c762baf2d7693183dbd6135a
parent 425229 5924a5748c6d10a047aea209f5e6608f8adcc852
child 425231 febdade6a6e28fb1fc39b088adf029daf9af7bfc
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarai
bugs1391237
milestone57.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 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()