Title: [158339] trunk/Tools
- Revision
- 158339
- Author
- [email protected]
- Date
- 2013-10-30 20:07:58 -0700 (Wed, 30 Oct 2013)
Log Message
kill-old-processes should kill Web Socket script
https://bugs.webkit.org/show_bug.cgi?id=123546
Reviewed by Benjamin Poulain.
* BuildSlaveSupport/kill-old-processes:
(main):
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/kill-old-processes (158338 => 158339)
--- trunk/Tools/BuildSlaveSupport/kill-old-processes 2013-10-31 02:36:12 UTC (rev 158338)
+++ trunk/Tools/BuildSlaveSupport/kill-old-processes 2013-10-31 03:07:58 UTC (rev 158339)
@@ -102,14 +102,14 @@
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 -E '.+/Python .+(run_webkit_tests|run-webkit-tests)' | grep -v grep | awk '{print $2}' | xargs kill")
+ os.system("ps aux | grep -E '.+/Python .+(run_webkit_tests|run-webkit-tests|mod_pywebsocket)' | 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)
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")
+ os.system("ps aux | grep -P '.+/python .+(run_webkit_tests|run-webkit-tests|mod_pywebsocket)' | 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 (158338 => 158339)
--- trunk/Tools/ChangeLog 2013-10-31 02:36:12 UTC (rev 158338)
+++ trunk/Tools/ChangeLog 2013-10-31 03:07:58 UTC (rev 158339)
@@ -1,3 +1,13 @@
+2013-10-30 Ryosuke Niwa <[email protected]>
+
+ kill-old-processes should kill Web Socket script
+ https://bugs.webkit.org/show_bug.cgi?id=123546
+
+ Reviewed by Benjamin Poulain.
+
+ * BuildSlaveSupport/kill-old-processes:
+ (main):
+
2013-10-30 Alexey Proskuryakov <[email protected]>
Set svn:ignore for .pyc files created for test-webkitpy.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
