Update kill-old-processes logic.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Oct 2011 04:09:44 +0000 (04:09 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Oct 2011 04:09:44 +0000 (04:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=63651

Patch by Lucas Forschler <lforschler@apple.com> on 2011-10-12
Reviewed by Ryosuke Niwa.

Remove unused mac platform specific folder.
Update master.config to use new kill-old-processes.

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
* BuildSlaveSupport/kill-old-processes:
* BuildSlaveSupport/mac: Removed.

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

Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
Tools/BuildSlaveSupport/kill-old-processes
Tools/ChangeLog

index fd326b1..11aafdf 100644 (file)
@@ -66,7 +66,7 @@ class KillOldProcesses(shell.Compile):
     name = "kill old processes"
     description = ["killing old processes"]
     descriptionDone = ["killed old processes"]
-    command = ["python", "./Tools/BuildSlaveSupport/win/kill-old-processes"]
+    command = ["python", "./Tools/BuildSlaveSupport/kill-old-processes"]
 
 class InstallChromiumDependencies(shell.ShellCommand):
     name = "gclient"
@@ -618,8 +618,7 @@ class Factory(factory.BuildFactory):
         factory.BuildFactory.__init__(self)
         self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly, features=features)
         self.addStep(CheckOutSource)
-        if platform in ("win", "chromium-win"):
-            self.addStep(KillOldProcesses)
+        self.addStep(KillOldProcesses)
         if platform == "win":
             self.addStep(InstallWin32Dependencies)
         if platform.startswith("chromium"):
index 6705e7d..8b7b494 100755 (executable)
@@ -82,8 +82,8 @@ def main():
         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
-    # FIXME: Should we return an exit code based on how the kills went?\r
+        sys.exit()\r
+        # FIXME: Should we return an exit code based on how the kills went?\r
 \r
 \r
 if __name__ == '__main__':\r
index 5b580c8..2f4bd0d 100644 (file)
@@ -1,3 +1,17 @@
+2011-10-12  Lucas Forschler  <lforschler@apple.com>
+
+        Update kill-old-processes logic.
+        https://bugs.webkit.org/show_bug.cgi?id=63651
+
+        Reviewed by Ryosuke Niwa.
+
+        Remove unused mac platform specific folder.
+        Update master.config to use new kill-old-processes.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        * BuildSlaveSupport/kill-old-processes:
+        * BuildSlaveSupport/mac: Removed.
+
 2011-10-12  Ryosuke Niwa  <rniwa@webkit.org>
 
         [NRWT] New tests without expected files are reported as flakey tests