diff options
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. # |