Modified: trunk/Tools/BuildSlaveSupport/kill-old-processes (219226 => 219227)
--- trunk/Tools/BuildSlaveSupport/kill-old-processes 2017-07-07 00:00:30 UTC (rev 219226)
+++ trunk/Tools/BuildSlaveSupport/kill-old-processes 2017-07-07 00:46:53 UTC (rev 219227)
@@ -25,7 +25,15 @@
import os, sys
+def listAllWebKitPrograms(builddir_bin):
+ foundWebKitPrograms = []
+ for root, dirs, files in os.walk(builddir_bin):
+ for file in files:
+ if os.access(os.path.join(root, file), os.X_OK):
+ foundWebKitPrograms.append(file)
+ return foundWebKitPrograms
+
def main(user=None):
tasksToKillWin = [
"cl.exe",
@@ -93,18 +101,20 @@
]
taskToKillUnix = [
- "apache2",
+ # System process that are executed as part of the build process
"cc1plus",
- "DumpRenderTree",
- "gold",
- "httpd",
+ "ld.gold",
"ld",
"make",
- "ruby",
+ "cmake",
"svn",
- "webkit_unit_tests",
- "WebKitTestRunner",
+ # System process that are executed as part of the test steps
"Xvfb",
+ "gdb",
+ "ruby",
+ "apache2",
+ "httpd",
+ # WebKit related process names are automatically generated for GTK+/WPE/JSCOnly
]
# This allows to specify on the environment of the bot a list of process that should be killed.
@@ -123,7 +133,8 @@
for task in tasksToKill + tasksToKillWin:
os.system("taskkill /t /f /im " + task)
elif sys.platform.startswith('linux'):
- for task in tasksToKill + taskToKillUnix:
+ builddir_bin = "WebKitBuild/Release/bin" if os.path.isdir("WebKitBuild/Release/bin") else "WebKitBuild/Debug/bin"
+ for task in tasksToKill + taskToKillUnix + listAllWebKitPrograms(builddir_bin):
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 (219226 => 219227)
--- trunk/Tools/ChangeLog 2017-07-07 00:00:30 UTC (rev 219226)
+++ trunk/Tools/ChangeLog 2017-07-07 00:46:53 UTC (rev 219227)
@@ -1,3 +1,18 @@
+2017-07-06 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [GTK][WPE] kill-old-process should kill more webkit related process
+ https://bugs.webkit.org/show_bug.cgi?id=174220
+
+ Reviewed by Michael Catanzaro.
+
+ Generate list of possible webkit-related process names and add
+ them to the list of process to kill.
+ Also update the possible system related process for GTK+/WPE.
+
+ * BuildSlaveSupport/kill-old-processes:
+ (listAllWebKitPrograms):
+ (main):
+
2017-07-06 Chris Dumez <cdu...@apple.com>
FileMonitor should not be ref counted
