Summary: | new-run-webkit-tests fails to start http server if one is already running | ||||||
---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Eric Seidel (no email) <eric> | ||||
Component: | Tools / Tests | Assignee: | Eric Seidel (no email) <eric> | ||||
Status: | RESOLVED FIXED | ||||||
Severity: | Normal | CC: | abarth, aroben | ||||
Priority: | P2 | ||||||
Version: | 528+ (Nightly build) | ||||||
Hardware: | Unspecified | ||||||
OS: | Unspecified | ||||||
Bug Depends on: | |||||||
Bug Blocks: | 34984 | ||||||
Attachments: |
|
Description
Eric Seidel (no email)
2011-07-05 15:11:33 PDT
Why not make NRWT automatically kill old httpd processes, like old-run-webkit-tests does? That would help regular folks, too, not just the bots. ORWT only will kill old httpds if they're using the webkit pid file: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/httpd.pm#L168 NRWT does the same: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py#L75 Looks like the assumed pid file names are different though: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/httpd.pm#L68 Looks like it produces /tmp/WebKit/httpd.pid http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py#L62 http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py#L51 http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py#L59 Looks like it produces: /tmp/WebKit/apache.pid (at least on Mac) I could easily change NRWT to look at httpd.pid instead, maybe that's the better fix? Why does windows kill-old-processes kill httpd? Created attachment 99756 [details]
Patch
Thanks for your prod, aroben. After my investigation realizing that the pid file paths were different, this fix is much cleaner. Because I had already cleaned up kill-old-processes, I added that to the patch (even though there are no functional changes, just removing the ^M line endings. Committed r90412: <http://trac.webkit.org/changeset/90412> |