diff options
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/test_shell_thread.py | 3 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/layout_package/test_shell_thread.py b/webkit/tools/layout_tests/layout_package/test_shell_thread.py index 5e49300..65415be 100644 --- a/webkit/tools/layout_tests/layout_package/test_shell_thread.py +++ b/webkit/tools/layout_tests/layout_package/test_shell_thread.py @@ -369,4 +369,7 @@ class TestShellThread(threading.Thread): self._test_shell_proc.stdout.close() if self._test_shell_proc.stderr: self._test_shell_proc.stderr.close() + if sys.platform not in ('win32', 'cygwin'): + # Closing stdin/stdout/stderr hangs sometimes on OS X. + subprocess.Popen(["kill", "-9", str(self._test_shell_proc.pid)]) self._test_shell_proc = None diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index c96387a..ff85852 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -783,7 +783,7 @@ def main(options, args): if not options.num_test_shells: # Only run stable configurations with multiple test_shells by default. - if False: + if options.target == 'Release': cpus = 1 if sys.platform in ('win32', 'cygwin'): cpus = int(os.environ.get('NUMBER_OF_PROCESSORS', 1)) diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 9e43a63..aff4ec3 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1446,7 +1446,7 @@ MAC : LayoutTests/http/tests/navigation/metaredirect-subframeload.html = FAIL MAC : LayoutTests/http/tests/navigation/redirect302-frames.html = FAIL MAC : LayoutTests/http/tests/navigation/relativeanchor-goback.html = FAIL MAC : LayoutTests/http/tests/navigation/reload-subframe-object.html = FAIL -MAC : LayoutTests/http/tests/navigation/slowmetaredirect-basic.html = FAIL +MAC : LayoutTests/http/tests/navigation/slowmetaredirect-basic.html = FAIL TIMEOUT MAC : LayoutTests/http/tests/navigation/slowtimerredirect-basic.html = FAIL MAC : LayoutTests/http/tests/navigation/success200-basic.html = FAIL MAC : LayoutTests/http/tests/navigation/success200-frames-loadsame.html = FAIL TIMEOUT |