diff options
author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-17 01:29:05 +0000 |
---|---|---|
committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-17 01:29:05 +0000 |
commit | 090bdc4ff7876a19b6010c2ef9ccc9d3c52a72fc (patch) | |
tree | ff7b054b23e31499113f7b43385f46b7134b6677 | |
parent | 678b3004a2fb8268855ea6fd67a85a4adcfba048 (diff) | |
download | chromium_src-090bdc4ff7876a19b6010c2ef9ccc9d3c52a72fc.zip chromium_src-090bdc4ff7876a19b6010c2ef9ccc9d3c52a72fc.tar.gz chromium_src-090bdc4ff7876a19b6010c2ef9ccc9d3c52a72fc.tar.bz2 |
Add back in the kill -9 in the hopes that it fixes hanging TestShells on mac bots.
Review URL: http://codereview.chromium.org/77009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13914 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | webkit/tools/layout_tests/layout_package/test_shell_thread.py | 3 |
1 files changed, 3 insertions, 0 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 bcd9e96..ddf0e24 100644 --- a/webkit/tools/layout_tests/layout_package/test_shell_thread.py +++ b/webkit/tools/layout_tests/layout_package/test_shell_thread.py @@ -396,4 +396,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 |