Changeset 219227 in webkit
- Timestamp:
- Jul 6, 2017 5:46:53 PM (7 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/kill-old-processes
r216447 r219227 25 25 26 26 import os, sys 27 28 def listAllWebKitPrograms(builddir_bin): 29 foundWebKitPrograms = [] 30 for root, dirs, files in os.walk(builddir_bin): 31 for file in files: 32 if os.access(os.path.join(root, file), os.X_OK): 33 foundWebKitPrograms.append(file) 34 return foundWebKitPrograms 27 35 28 36 … … 94 102 95 103 taskToKillUnix = [ 96 "apache2",104 # System process that are executed as part of the build process 97 105 "cc1plus", 98 "DumpRenderTree", 99 "gold", 100 "httpd", 106 "ld.gold", 101 107 "ld", 102 108 "make", 109 "cmake", 110 "svn", 111 # System process that are executed as part of the test steps 112 "Xvfb", 113 "gdb", 103 114 "ruby", 104 "svn", 105 "webkit_unit_tests", 106 "WebKitTestRunner", 107 "Xvfb", 115 "apache2", 116 "httpd", 117 # WebKit related process names are automatically generated for GTK+/WPE/JSCOnly 108 118 ] 109 119 … … 124 134 os.system("taskkill /t /f /im " + task) 125 135 elif sys.platform.startswith('linux'): 126 for task in tasksToKill + taskToKillUnix: 136 builddir_bin = "WebKitBuild/Release/bin" if os.path.isdir("WebKitBuild/Release/bin") else "WebKitBuild/Debug/bin" 137 for task in tasksToKill + taskToKillUnix + listAllWebKitPrograms(builddir_bin): 127 138 os.system("killall -9 -v " + task) 128 139 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
r219219 r219227 1 2017-07-06 Carlos Alberto Lopez Perez <clopez@igalia.com> 2 3 [GTK][WPE] kill-old-process should kill more webkit related process 4 https://bugs.webkit.org/show_bug.cgi?id=174220 5 6 Reviewed by Michael Catanzaro. 7 8 Generate list of possible webkit-related process names and add 9 them to the list of process to kill. 10 Also update the possible system related process for GTK+/WPE. 11 12 * BuildSlaveSupport/kill-old-processes: 13 (listAllWebKitPrograms): 14 (main): 15 1 16 2017-07-06 Chris Dumez <cdumez@apple.com> 2 17
Note: See TracChangeset
for help on using the changeset viewer.