Title: [97330] trunk/Tools
- Revision
- 97330
- Author
- [email protected]
- Date
- 2011-10-12 18:33:57 -0700 (Wed, 12 Oct 2011)
Log Message
Kill old run-webkit-tests processes in kill-process on Mac
https://bugs.webkit.org/show_bug.cgi?id=69976
Reviewed by Dirk Pranke.
Add a system call to remove all python processes running run-webkit-tests.
* BuildSlaveSupport/kill-old-processes:
* BuildSlaveSupport/mac: Removed.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/kill-old-processes (97329 => 97330)
--- trunk/Tools/BuildSlaveSupport/kill-old-processes 2011-10-13 01:23:06 UTC (rev 97329)
+++ trunk/Tools/BuildSlaveSupport/kill-old-processes 2011-10-13 01:33:57 UTC (rev 97330)
@@ -55,7 +55,6 @@
]
tasksToKillMac = [
- "httpd", # This shouldn't be needed, except currently there are bugs in NRWT's http locking code.
"jsc",
"make",
"per5.12",
@@ -77,6 +76,8 @@
if sys.platform == 'darwin':
for task in tasksToKillMac:
os.system("killall -9 -v -m " + task)
+ # Kill all instances of python executing run-webkit-tests
+ os.system("ps aux | grep -P '.+/Python .+(run_webkit_tests|run-webkit-tests)' | grep -v grep | awk '{print $2}' | xargs kill")
elif sys.platform == 'cygwin' or sys.platform == 'win32':
for task in tasksToKillWin:
os.system("taskkill /t /f /im " + task)
Modified: trunk/Tools/ChangeLog (97329 => 97330)
--- trunk/Tools/ChangeLog 2011-10-13 01:23:06 UTC (rev 97329)
+++ trunk/Tools/ChangeLog 2011-10-13 01:33:57 UTC (rev 97330)
@@ -1,3 +1,15 @@
+2011-10-12 Ryosuke Niwa <[email protected]>
+
+ Kill old run-webkit-tests processes in kill-process on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=69976
+
+ Reviewed by Dirk Pranke.
+
+ Add a system call to remove all python processes running run-webkit-tests.
+
+ * BuildSlaveSupport/kill-old-processes:
+ * BuildSlaveSupport/mac: Removed.
+
2011-10-12 Simon Fraser <[email protected]>
Many WK2 snapshots are blank
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
