Title: [112373] trunk/Tools
- Revision
- 112373
- Author
- [email protected]
- Date
- 2012-03-28 01:26:37 -0700 (Wed, 28 Mar 2012)
Log Message
kill-old-processes doesn't do anything on linux
https://bugs.webkit.org/show_bug.cgi?id=82388
Reviewed by Tony Chang.
Kill cc1plus, ld, etc... on linux. Also ps aux + grep to kill old run-webkit-tests processes.
This should help stabilizing Chromium linux bots.
* BuildSlaveSupport/kill-old-processes:
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/kill-old-processes (112372 => 112373)
--- trunk/Tools/BuildSlaveSupport/kill-old-processes 2012-03-28 08:22:33 UTC (rev 112372)
+++ trunk/Tools/BuildSlaveSupport/kill-old-processes 2012-03-28 08:26:37 UTC (rev 112373)
@@ -60,7 +60,7 @@
"clang",
"clang++",
"gcc-4.2",
- "i686-apple-darwin10-gcc-4.2.1"
+ "i686-apple-darwin10-gcc-4.2.1",
"jsc",
"make",
"pboard", # FIXME: https://bugs.webkit.org/show_bug.cgi?id=81012
@@ -81,6 +81,18 @@
"xcodebuild",
]
+ taskToKillUnix = [
+ "cc1plus",
+ "DumpRenderTree",
+ "gold",
+ "ld",
+ "make",
+ "ruby",
+ "svn",
+ "webkit_unit_tests",
+ "WebKitTestRunner",
+ ]
+
if sys.platform == 'darwin':
for task in tasksToKillMac:
os.system("killall -9 -v -m " + task)
@@ -89,6 +101,10 @@
elif sys.platform == 'cygwin' or sys.platform == 'win32':
for task in tasksToKillWin:
os.system("taskkill /t /f /im " + task)
+ elif sys.platform.startswith('linux'):
+ for task in taskToKillUnix:
+ os.system("killall -9 -v " + task)
+ os.system("ps aux | grep -P '.+/python .+(run_webkit_tests|run-webkit-tests)' | grep -v grep | awk '{print $2}' | xargs kill")
else:
sys.exit()
# FIXME: Should we return an exit code based on how the kills went?
Modified: trunk/Tools/ChangeLog (112372 => 112373)
--- trunk/Tools/ChangeLog 2012-03-28 08:22:33 UTC (rev 112372)
+++ trunk/Tools/ChangeLog 2012-03-28 08:26:37 UTC (rev 112373)
@@ -1,3 +1,15 @@
+2012-03-28 Ryosuke Niwa <[email protected]>
+
+ kill-old-processes doesn't do anything on linux
+ https://bugs.webkit.org/show_bug.cgi?id=82388
+
+ Reviewed by Tony Chang.
+
+ Kill cc1plus, ld, etc... on linux. Also ps aux + grep to kill old run-webkit-tests processes.
+ This should help stabilizing Chromium linux bots.
+
+ * BuildSlaveSupport/kill-old-processes:
+
2012-03-28 Philippe Normand <[email protected]>
[GTK] jhbuild wrongly tricked into clean-up
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
