From 10ebb4519873d9bd3f2009af80420df275e4d2d0 Mon Sep 17 00:00:00 2001 From: "lforschler@apple.com" Date: Tue, 14 Jun 2011 22:23:36 +0000 Subject: [PATCH] 2011-06-14 Lucas Forschler 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 --- .../{mac => }/kill-old-processes | 42 ++++++++++++++++--- Tools/ChangeLog | 13 ++++++ 2 files changed, 50 insertions(+), 5 deletions(-) rename Tools/BuildSlaveSupport/{mac => }/kill-old-processes (60%) 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 c6ae0374cb80..f42fbfc6fd53 100755 --- a/Tools/BuildSlaveSupport/mac/kill-old-processes +++ b/Tools/BuildSlaveSupport/kill-old-processes @@ -26,7 +26,33 @@ import os, sys def main(): - tasksToKill = [ "DumpRenderTree", + + 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", @@ -41,10 +67,16 @@ def main(): "TestWebKitAPI Web Content", "jsc", "Problem Reporter", - "WebKitPluginAgen"] - - for task in tasksToKill: - os.system("killall -9 -v -m " + task) + "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()) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 46a191bba448..aff32f965b13 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,16 @@ +2011-06-14 Lucas Forschler + + 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 Reviewed by Tony Chang. -- 2.36.0