kill-old-processes doesn't do anything on linux

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

Reviewed by Tony Chang.

Kill cc1plus, ld, etc... on linux. Also ps aux + grep to kill old run-webkit-tests processes.
This should help stabilizing Chromium linux bots.

* BuildSlaveSupport/kill-old-processes:

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

diff --git a/Tools/BuildSlaveSupport/kill-old-processes b/Tools/BuildSlaveSupport/kill-old-processes
index 65f45f5..54f27b2 100755 (executable)
--- a/Tools/BuildSlaveSupport/kill-old-processes
+++ b/Tools/BuildSlaveSupport/kill-old-processes
@@ -60,7 +60,7 @@ def main():
         "clang",\r
         "clang++",\r
         "gcc-4.2",\r
-        "i686-apple-darwin10-gcc-4.2.1"\r
+        "i686-apple-darwin10-gcc-4.2.1",\r
         "jsc",\r
         "make",\r
         "pboard", # FIXME: https://bugs.webkit.org/show_bug.cgi?id=81012\r
@@ -81,6 +81,18 @@ def main():
         "xcodebuild",\r
     ]\r
 \r
+    taskToKillUnix = [\r
+        "cc1plus",\r
+        "DumpRenderTree",\r
+        "gold",\r
+        "ld",\r
+        "make",\r
+        "ruby",\r
+        "svn",\r
+        "webkit_unit_tests",\r
+        "WebKitTestRunner",\r
+    ]\r
+\r
     if sys.platform == 'darwin':\r
         for task in tasksToKillMac:\r
             os.system("killall -9 -v -m " + task)\r
@@ -89,6 +101,10 @@ def main():
     elif sys.platform == 'cygwin' or sys.platform == 'win32':\r
         for task in tasksToKillWin:\r
             os.system("taskkill /t /f /im " + task)\r
+    elif sys.platform.startswith('linux'):\r
+        for task in taskToKillUnix:\r
+            os.system("killall -9 -v " + task)\r
+        os.system("ps aux | grep -P '.+/python .+(run_webkit_tests|run-webkit-tests)' | grep -v grep | awk '{print $2}' | xargs kill")\r
     else:\r
         sys.exit()\r
         # FIXME: Should we return an exit code based on how the kills went?\r

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 1f354bb..08888a0 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        kill-old-processes doesn't do anything on linux
+        https://bugs.webkit.org/show_bug.cgi?id=82388
+
+        Reviewed by Tony Chang.
+
+        Kill cc1plus, ld, etc... on linux. Also ps aux + grep to kill old run-webkit-tests processes.
+        This should help stabilizing Chromium linux bots.
+
+        * BuildSlaveSupport/kill-old-processes:
+
 2012-03-28  Philippe Normand  <pnormand@igalia.com>
 
         [GTK] jhbuild wrongly tricked into clean-up