From 090bdc4ff7876a19b6010c2ef9ccc9d3c52a72fc Mon Sep 17 00:00:00 2001 From: "ojan@google.com" Date: Fri, 17 Apr 2009 01:29:05 +0000 Subject: 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 --- webkit/tools/layout_tests/layout_package/test_shell_thread.py | 3 +++ 1 file changed, 3 insertions(+) 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 -- cgit v1.1