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
--- 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()