2011-06-14 Lucas Forschler <lforschler@apple.com>

        Reviewed by Stephanie Lewis.

        https://bugs.webkit.org/show_bug.cgi?id=62495
        Bug 62495 - combine windows and mac kill-old-processes script
        Add a platform agnostic script.  Remove the recently added mac flavor.
        Note: Leaving the windows one alone, since it is currently used by the WebKit bots.

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

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

diff --git a/Tools/BuildSlaveSupport/mac/kill-old-processes b/Tools/BuildSlaveSupport/kill-old-processes
similarity index 60%
rename from Tools/BuildSlaveSupport/mac/kill-old-processes
rename to Tools/BuildSlaveSupport/kill-old-processes
index c6ae0374cb806d48cfa9dddb42a7b993f4a51cab..f42fbfc6fd536adcb3cfd7964523760e854bb6b2 100755 (executable)
--- a/Tools/BuildSlaveSupport/mac/kill-old-processes
+++ b/Tools/BuildSlaveSupport/kill-old-processes
@@ -26,7 +26,33 @@
 import os, sys\r
 \r
 def main():\r
-    tasksToKill = [ "DumpRenderTree", \r
+\r
+    tasksToKillWin = [ "cl.exe", \r
+                                       "devenv.com", \r
+                                       "devenv.exe", \r
+                                       "DumpRenderTree.exe", \r
+                                       "DumpRenderTree_debug.exe",\r
+                                       "httpd.exe", \r
+                                       "imagediff.exe", \r
+                                       "imagediff_debug.exe", \r
+                                       "jsc.exe", \r
+                                       "jsc_debug.exe",\r
+                                       "LightTPD.exe", \r
+                                       "link.exe", \r
+                                       "midl.exe", \r
+                                       "perl.exe", \r
+                                       "Safari.exe", \r
+                                       "svn.exe", \r
+                                       "testapi.exe", \r
+                                       "testapi_debug.exe", \r
+                                       "VcBuildHelper.exe", \r
+                                       "wdiff.exe", \r
+                                       "WebKit2WebProcess.exe", \r
+                                       "WebKit2WebProcess_debug.exe", \r
+                                       "WebKitTestRunner.exe", \r
+                                       "WebKitTestRunner_debug.exe" ]\r
+\r
+    tasksToKillMac = [ "DumpRenderTree", \r
                                        "make",\r
                                        "perl", \r
                                        "per5.12",\r
@@ -41,10 +67,16 @@ def main():
                                        "TestWebKitAPI Web Content",\r
                                        "jsc",\r
                                        "Problem Reporter",\r
-                                       "WebKitPluginAgen"]\r
-                                       \r
-    for task in tasksToKill:\r
-        os.system("killall -9 -v -m " + task)\r
+                                       "WebKitPluginAgen" ]\r
+\r
+    if sys.platform == 'darwin':\r
+        for task in tasksToKillMac:\r
+            os.system("killall -9 -v -m " + task)\r
+    elif sys.platform == 'cygwin' or sys.platform == 'win32':\r
+        for task in tasksToKillWin:\r
+            os.system("taskkill /t /f /im " + task)\r
+    else:\r
+        raise Exception("Have not implemented kill-old-processes for this platform")  \r
 \r
 if __name__ == '__main__':\r
     sys.exit(main())\r

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 46a191bba4485f2ae9523d79e4c1b535ee8aebe1..aff32f965b13a9389c629b36e4a857bff150851d 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2011-06-14  Lucas Forschler  <lforschler@apple.com>
+
+        Reviewed by Stephanie Lewis.
+
+        https://bugs.webkit.org/show_bug.cgi?id=62495
+        Bug 62495 - combine windows and mac kill-old-processes script
+        Add a platform agnostic script.  Remove the recently added mac flavor.
+        Note: Leaving the windows one alone, since it is currently used by the WebKit bots.
+        
+        * BuildSlaveSupport/kill-old-processes: Added.
+        * BuildSlaveSupport/mac: Removed.
+        * BuildSlaveSupport/mac/kill-old-processes: Removed.
+
 2011-06-14  Dirk Pranke  <dpranke@chromium.org>
 
         Reviewed by Tony Chang.