Title: [88857] trunk/Tools
Revision
88857
Author
[email protected]
Date
2011-06-14 15:23:36 -0700 (Tue, 14 Jun 2011)

Log Message

2011-06-14  Lucas Forschler  <[email protected]>

        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.

Modified Paths

Added Paths

Removed Paths

Diff

Copied: trunk/Tools/BuildSlaveSupport/kill-old-processes (from rev 88856, trunk/Tools/BuildSlaveSupport/mac/kill-old-processes) (0 => 88857)


--- trunk/Tools/BuildSlaveSupport/kill-old-processes	                        (rev 0)
+++ trunk/Tools/BuildSlaveSupport/kill-old-processes	2011-06-14 22:23:36 UTC (rev 88857)
@@ -0,0 +1,82 @@
+#!/usr/bin/python
+
+# Copyright (C) 2010 Apple Inc.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer. 
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution. 
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import os, sys
+
+def main():
+
+    tasksToKillWin = [ "cl.exe", 
+					"devenv.com", 
+					"devenv.exe", 
+					"DumpRenderTree.exe", 
+					"DumpRenderTree_debug.exe",
+					"httpd.exe", 
+					"imagediff.exe", 
+					"imagediff_debug.exe", 
+					"jsc.exe", 
+					"jsc_debug.exe",
+					"LightTPD.exe", 
+					"link.exe", 
+					"midl.exe", 
+					"perl.exe", 
+					"Safari.exe", 
+					"svn.exe", 
+					"testapi.exe", 
+					"testapi_debug.exe", 
+					"VcBuildHelper.exe", 
+					"wdiff.exe", 
+					"WebKit2WebProcess.exe", 
+					"WebKit2WebProcess_debug.exe", 
+					"WebKitTestRunner.exe", 
+					"WebKitTestRunner_debug.exe" ]
+
+    tasksToKillMac = [ "DumpRenderTree", 
+					"make",
+					"perl", 
+					"per5.12",
+					"ruby",
+					"Safari", 
+					"Safari Web Content",
+					"WebProcess"
+					"svn", 
+					"WebKitTestRunner",
+					"WebKitTestRunner Web Content",
+					"TestWebKitAPI",
+					"TestWebKitAPI Web Content",
+					"jsc",
+					"Problem Reporter",
+					"WebKitPluginAgen" ]
+
+    if sys.platform == 'darwin':
+        for task in tasksToKillMac:
+            os.system("killall -9 -v -m " + task)
+    elif sys.platform == 'cygwin' or sys.platform == 'win32':
+        for task in tasksToKillWin:
+            os.system("taskkill /t /f /im " + task)
+    else:
+        raise Exception("Have not implemented kill-old-processes for this platform")  
+
+if __name__ == '__main__':
+    sys.exit(main())

Deleted: trunk/Tools/BuildSlaveSupport/mac/kill-old-processes (88856 => 88857)


--- trunk/Tools/BuildSlaveSupport/mac/kill-old-processes	2011-06-14 22:18:05 UTC (rev 88856)
+++ trunk/Tools/BuildSlaveSupport/mac/kill-old-processes	2011-06-14 22:23:36 UTC (rev 88857)
@@ -1,50 +0,0 @@
-#!/usr/bin/python
-
-# Copyright (C) 2010 Apple Inc.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer. 
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution. 
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import os, sys
-
-def main():
-    tasksToKill = [ "DumpRenderTree", 
-					"make",
-					"perl", 
-					"per5.12",
-					"ruby",
-					"Safari", 
-					"Safari Web Content",
-					"WebProcess"
-					"svn", 
-					"WebKitTestRunner",
-					"WebKitTestRunner Web Content",
-					"TestWebKitAPI",
-					"TestWebKitAPI Web Content",
-					"jsc",
-					"Problem Reporter",
-					"WebKitPluginAgen"]
-					
-    for task in tasksToKill:
-        os.system("killall -9 -v -m " + task)
-
-if __name__ == '__main__':
-    sys.exit(main())

Modified: trunk/Tools/ChangeLog (88856 => 88857)


--- trunk/Tools/ChangeLog	2011-06-14 22:18:05 UTC (rev 88856)
+++ trunk/Tools/ChangeLog	2011-06-14 22:23:36 UTC (rev 88857)
@@ -1,3 +1,16 @@
+2011-06-14  Lucas Forschler  <[email protected]>
+
+        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  <[email protected]>
 
         Reviewed by Tony Chang.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to