The Windows test bots are periodically getting stuck in a mode where the httpd server is leaving a pidfile around. When this happens on Windows, the existing recovery code doesn't really work properly; I think this is primarily because webkitpy doesn't provide code to check for a running Windows PID, so the fallback code that tries to decide if a server is really running is just a no-op. This patch does two things: 1. Instead of using the Cygwin /tmp folder to hold the PID file, it switches to using the XAMPP's standard file location. Since Apache is running as a Windows Service there is some confusing interactions with Windows vs. Cygwin file ownership. I am hoping that leaving this file where the XAMPP build (and Windows service) expects it to live. 2. Since the Windows webkitpy implementation doesn't actually check whether the PID is actually running, we skip the code path where the abandoned PID file is deleted. This patch makes sure we delete the abandoned file in the case where asking httpd to stop (which will do nothing if it wasn't running) doesn't cause the file to go away.
Created attachment 245927 [details] Patch
Committed r179550: <http://trac.webkit.org/changeset/179550>