Changeset 195587 in webkit

Timestamp:

Jan 26, 2016 7:47:54 AM (8 years ago)

Author:

clopez@igalia.com

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

Location:

trunk/Tools

Files:

• BuildSlaveSupport/kill-old-processes (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/kill-old-processes

@@ -108 +108 @@
     ]
 
+    # 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")

trunk/Tools/ChangeLog

@@ +1 @@
+2016-01-26  Carlos Alberto Lopez Perez  <clopez@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.fraser@apple.com>