Changeset 90412 in webkit
- Timestamp:
- Jul 5, 2011 3:59:53 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/kill-old-processes
r88857 r90412 1 1 #!/usr/bin/python 2 3 2 # Copyright (C) 2010 Apple Inc. All rights reserved. 3 # Copyright (C) 2011 Google Inc. All rights reserved. 4 4 # 5 5 # Redistribution and use in source and binary forms, with or without … … 8 8 # 9 9 # 1. Redistributions of source code must retain the above copyright 10 # notice, this list of conditions and the following disclaimer. 10 # notice, this list of conditions and the following disclaimer. 11 11 # 2. Redistributions in binary form must reproduce the above copyright 12 12 # notice, this list of conditions and the following disclaimer in the 13 # documentation and/or other materials provided with the distribution. 13 # documentation and/or other materials provided with the distribution. 14 14 # 15 15 # THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY … … 26 26 import os, sys 27 27 28 28 29 def main(): 30 tasksToKillWin = [ 31 "cl.exe", 32 "devenv.com", 33 "devenv.exe", 34 "DumpRenderTree.exe", 35 "DumpRenderTree_debug.exe", 36 "httpd.exe", 37 "imagediff.exe", 38 "imagediff_debug.exe", 39 "jsc.exe", 40 "jsc_debug.exe", 41 "LightTPD.exe", 42 "link.exe", 43 "midl.exe", 44 "perl.exe", 45 "Safari.exe", 46 "svn.exe", 47 "testapi.exe", 48 "testapi_debug.exe", 49 "VcBuildHelper.exe", 50 "wdiff.exe", 51 "WebKit2WebProcess.exe", 52 "WebKit2WebProcess_debug.exe", 53 "WebKitTestRunner.exe", 54 "WebKitTestRunner_debug.exe", 55 ] 29 56 30 tasksToKillWin = [ "cl.exe", 31 "devenv.com", 32 "devenv.exe", 33 "DumpRenderTree.exe", 34 "DumpRenderTree_debug.exe", 35 "httpd.exe", 36 "imagediff.exe", 37 "imagediff_debug.exe", 38 "jsc.exe", 39 "jsc_debug.exe", 40 "LightTPD.exe", 41 "link.exe", 42 "midl.exe", 43 "perl.exe", 44 "Safari.exe", 45 "svn.exe", 46 "testapi.exe", 47 "testapi_debug.exe", 48 "VcBuildHelper.exe", 49 "wdiff.exe", 50 "WebKit2WebProcess.exe", 51 "WebKit2WebProcess_debug.exe", 52 "WebKitTestRunner.exe", 53 "WebKitTestRunner_debug.exe" ] 54 55 tasksToKillMac = [ "DumpRenderTree", 56 "make", 57 "perl", 58 "per5.12", 59 "ruby", 60 "Safari", 61 "Safari Web Content", 62 "WebProcess" 63 "svn", 64 "WebKitTestRunner", 65 "WebKitTestRunner Web Content", 66 "TestWebKitAPI", 67 "TestWebKitAPI Web Content", 68 "jsc", 69 "Problem Reporter", 70 "WebKitPluginAgen" ] 57 tasksToKillMac = [ 58 "jsc", 59 "make", 60 "per5.12", 61 "perl", 62 "Problem Reporter", 63 "ruby", 64 "Safari Web Content", 65 "Safari", 66 "svn", 67 "DumpRenderTree", 68 "TestWebKitAPI Web Content", 69 "TestWebKitAPI", 70 "WebKitPluginAgen", # Why no 't'? 71 "WebKitTestRunner Web Content", 72 "WebKitTestRunner", 73 "WebProcess", 74 ] 71 75 72 76 if sys.platform == 'darwin': … … 77 81 os.system("taskkill /t /f /im " + task) 78 82 else: 79 raise Exception("Have not implemented kill-old-processes for this platform") 83 raise Exception("Have not implemented kill-old-processes for this platform") 84 # FIXME: Should we return an exit code based on how the kills went? 85 80 86 81 87 if __name__ == '__main__': -
trunk/Tools/ChangeLog
r90411 r90412 1 2011-07-05 Eric Seidel <eric@webkit.org> 2 3 new-run-webkit-tests fails to start http server if one is already running 4 https://bugs.webkit.org/show_bug.cgi?id=63956 5 6 Reviewed by Adam Barth. 7 8 * BuildSlaveSupport/kill-old-processes: 9 - Removed ^M line endings and sorted the process names. 10 - There are no functional changes to this file. 11 (except that now that its using unix line endings it can be executed directly!) 12 * Scripts/webkitpy/layout_tests/servers/apache_http_server.py: 13 - Change the name to 'httpd' to match old-run-webkit-test paths. 14 1 15 2011-07-05 Adam Barth <abarth@webkit.org> 2 16 -
trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py
r89798 r90412 49 49 """ 50 50 http_server_base.HttpServerBase.__init__(self, port_obj) 51 self._name = 'apache' 51 # We use the name "httpd" instead of "apache" to make our paths (e.g. the pid file: /tmp/WebKit/httpd.pid) 52 # match old-run-webkit-tests: https://bugs.webkit.org/show_bug.cgi?id=63956 53 self._name = 'httpd' 52 54 self._mappings = [{'port': 8000}, 53 55 {'port': 8080},
Note: See TracChangeset
for help on using the changeset viewer.