summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-09 22:34:33 +0000
committerpamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-09 22:34:33 +0000
commite025ef6b51ab89989971abb7930e741a50a92bc2 (patch)
tree87ea875e28c8c0b224af9a18e85a3a0efe15f229
parente057bc37c5a05afd8dfd32a858b2bb5777984126 (diff)
downloadchromium_src-e025ef6b51ab89989971abb7930e741a50a92bc2.zip
chromium_src-e025ef6b51ab89989971abb7930e741a50a92bc2.tar.gz
chromium_src-e025ef6b51ab89989971abb7930e741a50a92bc2.tar.bz2
Fix call to TestShellBinary() used when a test_shell thread hangs solidly
enough to trigger the Python timer watchdog. This doesn't happen much, but can come up in the Purify layout test runs. BUG=5318 TEST=none Review URL: http://codereview.chromium.org/13306 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6642 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/layout_package/platform_utils_win.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_win.py b/webkit/tools/layout_tests/layout_package/platform_utils_win.py
index 5403e11..06bc445 100644
--- a/webkit/tools/layout_tests/layout_package/platform_utils_win.py
+++ b/webkit/tools/layout_tests/layout_package/platform_utils_win.py
@@ -80,8 +80,7 @@ class PlatformUtility(google.platform_utils_win.PlatformUtility):
def KillAllTestShells(self):
"""Kills all instances of the test_shell binary currently running."""
- subprocess.Popen(('taskkill.exe', '/f', '/im',
- layout_package_path_utils.TestShellBinary()),
+ subprocess.Popen(['taskkill.exe', '/f', '/im', self.TestShellBinary()],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE).wait()