Kill old run-webkit-tests processes in kill-process on Mac

https://bugs.webkit.org/show_bug.cgi?id=69976

Reviewed by Dirk Pranke.

Add a system call to remove all python processes running run-webkit-tests.

* BuildSlaveSupport/kill-old-processes:
* BuildSlaveSupport/mac: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@97330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/kill-old-processes b/Tools/BuildSlaveSupport/kill-old-processes
index 8296853c276d376fef98ecd11c8a4334c1dd35ba..6705e7d7d9efd59203300147826dbbb9043f482f 100755 (executable)
--- a/Tools/BuildSlaveSupport/kill-old-processes
+++ b/Tools/BuildSlaveSupport/kill-old-processes
@@ -55,7 +55,6 @@ def main():
     ]\r
 \r
     tasksToKillMac = [\r
-        "httpd", # This shouldn't be needed, except currently there are bugs in NRWT's http locking code.\r
         "jsc",\r
         "make",\r
         "per5.12",\r
@@ -77,6 +76,8 @@ def main():
     if sys.platform == 'darwin':\r
         for task in tasksToKillMac:\r
             os.system("killall -9 -v -m " + task)\r
+        # Kill all instances of python executing run-webkit-tests\r
+        os.system("ps aux | grep -P '.+/Python .+(run_webkit_tests|run-webkit-tests)' | grep -v grep | awk '{print $2}' | xargs kill")\r
     elif sys.platform == 'cygwin' or sys.platform == 'win32':\r
         for task in tasksToKillWin:\r
             os.system("taskkill /t /f /im " + task)\r

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4475cb1cc5e1671ed37799c3cf499df23b91c9da..17511f97ebe25f7d0ff920474858fa228a0e9eb8 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-10-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Kill old run-webkit-tests processes in kill-process on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=69976
+
+        Reviewed by Dirk Pranke.
+
+        Add a system call to remove all python processes running run-webkit-tests.
+
+        * BuildSlaveSupport/kill-old-processes:
+        * BuildSlaveSupport/mac: Removed.
+
 2011-10-12  Simon Fraser  <simon.fraser@apple.com>
 
         Many WK2 snapshots are blank