2011-03-03 Tony Chang <tony@chromium.org>

        Reviewed by Dimitri Glazkov.

        [chromium] Run kill-old-processes on the chromium-win bot too
        https://bugs.webkit.org/show_bug.cgi?id=55630

        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
        * BuildSlaveSupport/win/kill-old-processes: Add wdiff.exe to the kill list.

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

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index fafd802d5b19f38fc57f07466f70f6a0b1c598ae..79130958bfead174616f7c3f928a839ccadfa024 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -420,8 +420,9 @@ class Factory(factory.BuildFactory):
         factory.BuildFactory.__init__(self)
         self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly)
         self.addStep(CheckOutSource)
-        if platform == "win":
+        if platform in ("win", "chromium-win"):
             self.addStep(KillOldProcesses)
+        if platform == "win":
             self.addStep(InstallWin32Dependencies)
         if platform.startswith("chromium"):
             self.addStep(InstallChromiumDependencies)

diff --git a/Tools/BuildSlaveSupport/win/kill-old-processes b/Tools/BuildSlaveSupport/win/kill-old-processes
index 6760e08e39afac1c914e53396885a0b1fa2515b3..885d6fa081a7a69238e560f317cedb20fb4f2db2 100755 (executable)
--- a/Tools/BuildSlaveSupport/win/kill-old-processes
+++ b/Tools/BuildSlaveSupport/win/kill-old-processes
@@ -29,7 +29,8 @@ def main():
     tasksToKill = ["DumpRenderTree.exe", "DumpRenderTree_debug.exe", "testapi.exe", "testapi_debug.exe",\r
                 "svn.exe", "httpd.exe", "cl.exe", "link.exe", "midl.exe", "devenv.exe", "perl.exe",\r
                 "imagediff.exe", "imagediff_debug.exe", "jsc.exe", "jsc_debug.exe", "WebKit2WebProcess.exe",\r
-                "WebKit2WebProcess_debug.exe", "WebKitTestRunner.exe", "WebKitTestRunner_debug.exe"]\r
+                "WebKit2WebProcess_debug.exe", "WebKitTestRunner.exe", "WebKitTestRunner_debug.exe",\r
+                "wdiff.exe"]\r
 \r
     for task in tasksToKill:\r
         os.system("taskkill /f /im " + task)\r

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 1960f6972b4018aed67f79841cd72ba1c0714fd4..a8053126ea5af0d8580079f34c6d556fa74d2b29 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-03  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [chromium] Run kill-old-processes on the chromium-win bot too
+        https://bugs.webkit.org/show_bug.cgi?id=55630
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        * BuildSlaveSupport/win/kill-old-processes: Add wdiff.exe to the kill list.
+
 2011-03-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Reviewed by Martin Robinson.