Bug 1297652 - Remove jit-test workaround for Windows/NSPR threading issues. r=fitzgen
☠☠ backed out by 6d68d4884890 ☠ ☠
authorJan de Mooij <jdemooij@mozilla.com>
Wed, 07 Sep 2016 12:47:09 +0200
changeset 354299 c1c9882472df9624b37436208c278021a9b0ff44
parent 354298 f590934ef71f3fb00a7339c992677eda891d3705
child 354300 b48c0088fad27760cbae9733af3d6e3e0afad5df
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfitzgen
bugs1297652
milestone51.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 1297652 - Remove jit-test workaround for Windows/NSPR threading issues. r=fitzgen
js/src/tests/lib/jittests.py
--- a/js/src/tests/lib/jittests.py
+++ b/js/src/tests/lib/jittests.py
@@ -333,25 +333,16 @@ def run_test_remote(test, device, prefix
     # 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:
             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()
-            if ver.major == 6 and ver.minor <= 1:
-                return True
         return False
 
     if test.expect_error:
         # The shell exits with code 3 on uncaught exceptions.
         # Sometimes 0 is returned on Windows for unknown reasons.
         # See bug 899697.
         if sys.platform in ['win32', 'cygwin']:
             if rc != 3 and rc != 0: