Title: [97341] trunk/Tools
- Revision
- 97341
- Author
- [email protected]
- Date
- 2011-10-12 21:09:44 -0700 (Wed, 12 Oct 2011)
Log Message
Update kill-old-processes logic.
https://bugs.webkit.org/show_bug.cgi?id=63651
Patch by Lucas Forschler <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (97340 => 97341)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-10-13 03:59:44 UTC (rev 97340)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-10-13 04:09:44 UTC (rev 97341)
@@ -66,7 +66,7 @@
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 @@
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"):
Modified: trunk/Tools/BuildSlaveSupport/kill-old-processes (97340 => 97341)
--- trunk/Tools/BuildSlaveSupport/kill-old-processes 2011-10-13 03:59:44 UTC (rev 97340)
+++ trunk/Tools/BuildSlaveSupport/kill-old-processes 2011-10-13 04:09:44 UTC (rev 97341)
@@ -82,8 +82,8 @@
for task in tasksToKillWin:
os.system("taskkill /t /f /im " + task)
else:
- raise Exception("Have not implemented kill-old-processes for this platform")
- # FIXME: Should we return an exit code based on how the kills went?
+ sys.exit()
+ # FIXME: Should we return an exit code based on how the kills went?
if __name__ == '__main__':
Modified: trunk/Tools/ChangeLog (97340 => 97341)
--- trunk/Tools/ChangeLog 2011-10-13 03:59:44 UTC (rev 97340)
+++ trunk/Tools/ChangeLog 2011-10-13 04:09:44 UTC (rev 97341)
@@ -1,3 +1,17 @@
+2011-10-12 Lucas Forschler <[email protected]>
+
+ 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 <[email protected]>
[NRWT] New tests without expected files are reported as flakey tests
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
