diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-21 21:47:48 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-21 21:47:48 +0000 |
| commit | 0eb0f46703fdbe6a534fcd13eda61989c4bc2505 (patch) | |
| tree | 9dd30caf1c944bc98382be932645d2ca4db6b1fa /webkit | |
| parent | 38f6f388ebce7e9d01399254e21e04d3960ef23f (diff) | |
| download | chromium_src-0eb0f46703fdbe6a534fcd13eda61989c4bc2505.zip chromium_src-0eb0f46703fdbe6a534fcd13eda61989c4bc2505.tar.gz chromium_src-0eb0f46703fdbe6a534fcd13eda61989c4bc2505.tar.bz2 | |
Implement KillAllTestShells.
The linux valgrind bot is trying to call this function. Seems like it was
removed in an earlier refactoring by mistake.
Review URL: http://codereview.chromium.org/207043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
4 files changed, 21 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/layout_package/path_utils.py b/webkit/tools/layout_tests/layout_package/path_utils.py index ca730b3..39e8d13 100644 --- a/webkit/tools/layout_tests/layout_package/path_utils.py +++ b/webkit/tools/layout_tests/layout_package/path_utils.py @@ -290,3 +290,6 @@ def FuzzyMatchPath(): def ShutDownHTTPServer(server_process): return platform_utils.ShutDownHTTPServer(server_process) + +def KillAllTestShells(): + platform_utils.KillAllTestShells() diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py index 3d0eedf..d507204 100644 --- a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py +++ b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py @@ -117,6 +117,12 @@ def ShutDownHTTPServer(server_process): else: os.kill(server_process.pid, signal.SIGTERM) +def KillAllTestShells(): + """Kills all instances of the test_shell binary currently running.""" + subprocess.Popen(('killall', '-TERM', 'test_shell'), + stdout=subprocess.PIPE, + stderr=subprocess.PIPE).wait() + # # Private helper functions # diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_mac.py b/webkit/tools/layout_tests/layout_package/platform_utils_mac.py index ff0c99f..71bf448 100644 --- a/webkit/tools/layout_tests/layout_package/platform_utils_mac.py +++ b/webkit/tools/layout_tests/layout_package/platform_utils_mac.py @@ -101,3 +101,9 @@ def ShutDownHTTPServer(server_process): else: os.kill(server_process.pid, signal.SIGTERM) +def KillAllTestShells(): + """Kills all instances of the test_shell binary currently running.""" + subprocess.Popen(('killall', '-TERM', 'test_shell'), + stdout=subprocess.PIPE, + stderr=subprocess.PIPE).wait() + 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 bb1bb9e..7c54d6b8 100644 --- a/webkit/tools/layout_tests/layout_package/platform_utils_win.py +++ b/webkit/tools/layout_tests/layout_package/platform_utils_win.py @@ -109,6 +109,12 @@ def ShutDownHTTPServer(server_process): stdout=subprocess.PIPE, stderr=subprocess.PIPE).wait() +def KillAllTestShells(self): + """Kills all instances of the test_shell binary currently running.""" + subprocess.Popen(('taskkill.exe', '/f', '/im', 'test_shell.exe'), + stdout=subprocess.PIPE, + stderr=subprocess.PIPE).wait() + # # Private helper functions. # |