Title: [195587] trunk/Tools
- Revision
- 195587
- Author
- clo...@igalia.com
- Date
- 2016-01-26 07:47:54 -0800 (Tue, 26 Jan 2016)
Log Message
kill-old-processes: allow to specify on the environment of the bot a list of process that should be killed.
https://bugs.webkit.org/show_bug.cgi?id=153483
Reviewed by Csaba Osztrogonác.
* BuildSlaveSupport/kill-old-processes:
(main): Allow to specify extra tasks to kill via the environment variable WEBKITBOT_TASKSTOKILL
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/kill-old-processes (195586 => 195587)
--- trunk/Tools/BuildSlaveSupport/kill-old-processes 2016-01-26 09:45:51 UTC (rev 195586)
+++ trunk/Tools/BuildSlaveSupport/kill-old-processes 2016-01-26 15:47:54 UTC (rev 195587)
@@ -107,16 +107,18 @@
"Xvfb",
]
+ # This allows to specify on the environment of the bot a list of process that should be killed.
+ tasksToKill = os.getenv("WEBKITBOT_TASKSTOKILL", "").split()
if sys.platform == 'darwin':
- for task in tasksToKillMac:
+ for task in tasksToKill + 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|mod_pywebsocket)' | grep -v grep | awk '{print $2}' | xargs kill")
elif sys.platform == 'cygwin' or sys.platform == 'win32':
- for task in tasksToKillWin:
+ for task in tasksToKill + tasksToKillWin:
os.system("taskkill /t /f /im " + task)
elif sys.platform.startswith('linux'):
- for task in taskToKillUnix:
+ for task in tasksToKill + taskToKillUnix:
os.system("killall -9 -v " + task)
os.system("ps aux | grep -P '.+/python .+(run_webkit_tests|run-webkit-tests|mod_pywebsocket)' | grep -v grep | awk '{print $2}' | xargs kill")
else:
Modified: trunk/Tools/ChangeLog (195586 => 195587)
--- trunk/Tools/ChangeLog 2016-01-26 09:45:51 UTC (rev 195586)
+++ trunk/Tools/ChangeLog 2016-01-26 15:47:54 UTC (rev 195587)
@@ -1,3 +1,13 @@
+2016-01-26 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ kill-old-processes: allow to specify on the environment of the bot a list of process that should be killed.
+ https://bugs.webkit.org/show_bug.cgi?id=153483
+
+ Reviewed by Csaba Osztrogonác.
+
+ * BuildSlaveSupport/kill-old-processes:
+ (main): Allow to specify extra tasks to kill via the environment variable WEBKITBOT_TASKSTOKILL
+
2016-01-25 Simon Fraser <simon.fra...@apple.com>
Give the layout test results file a <title> showing the date and time the tests were run
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
