Make kill-old-processes kill httpd on mac
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Jul 2011 23:28:25 +0000 (23:28 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Jul 2011 23:28:25 +0000 (23:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=64898

Reviewed by Adam Barth.

* BuildSlaveSupport/kill-old-processes:
 - The line endings seem to have flipped again,
   Thus making this diff gigantic.  The only line
   changed is the "httpd" line.  I suspect we'll need
   to set the line ending style from an svn checkout.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@91421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/BuildSlaveSupport/kill-old-processes
Tools/ChangeLog

index 3fa1fbc..8296853 100755 (executable)
@@ -29,49 +29,50 @@ import os, sys
 def main():\r
     tasksToKillWin = [\r
         "cl.exe",\r
-               "devenv.com",\r
-               "devenv.exe",\r
-               "DumpRenderTree.exe",\r
-               "DumpRenderTree_debug.exe",\r
-               "httpd.exe",\r
-               "imagediff.exe",\r
-               "imagediff_debug.exe",\r
-               "jsc.exe",\r
-               "jsc_debug.exe",\r
-               "LightTPD.exe",\r
-               "link.exe",\r
-               "midl.exe",\r
-               "perl.exe",\r
-               "Safari.exe",\r
-               "svn.exe",\r
-               "testapi.exe",\r
-               "testapi_debug.exe",\r
-               "VcBuildHelper.exe",\r
-               "wdiff.exe",\r
-               "WebKit2WebProcess.exe",\r
-               "WebKit2WebProcess_debug.exe",\r
-               "WebKitTestRunner.exe",\r
-               "WebKitTestRunner_debug.exe",\r
-       ]\r
+        "devenv.com",\r
+        "devenv.exe",\r
+        "DumpRenderTree.exe",\r
+        "DumpRenderTree_debug.exe",\r
+        "httpd.exe",\r
+        "imagediff.exe",\r
+        "imagediff_debug.exe",\r
+        "jsc.exe",\r
+        "jsc_debug.exe",\r
+        "LightTPD.exe",\r
+        "link.exe",\r
+        "midl.exe",\r
+        "perl.exe",\r
+        "Safari.exe",\r
+        "svn.exe",\r
+        "testapi.exe",\r
+        "testapi_debug.exe",\r
+        "VcBuildHelper.exe",\r
+        "wdiff.exe",\r
+        "WebKit2WebProcess.exe",\r
+        "WebKit2WebProcess_debug.exe",\r
+        "WebKitTestRunner.exe",\r
+        "WebKitTestRunner_debug.exe",\r
+    ]\r
 \r
     tasksToKillMac = [\r
-               "jsc",\r
-               "make",\r
-               "per5.12",\r
-               "perl",\r
-               "Problem Reporter",\r
-               "ruby",\r
-               "Safari Web Content",\r
-               "Safari",\r
-               "svn",\r
-               "DumpRenderTree",\r
-               "TestWebKitAPI Web Content",\r
-               "TestWebKitAPI",\r
-               "WebKitPluginAgen", # Why no 't'?\r
-               "WebKitTestRunner Web Content",\r
-               "WebKitTestRunner",\r
-               "WebProcess",\r
-       ]\r
+        "httpd", # This shouldn't be needed, except currently there are bugs in NRWT's http locking code.\r
+        "jsc",\r
+        "make",\r
+        "per5.12",\r
+        "perl",\r
+        "Problem Reporter",\r
+        "ruby",\r
+        "Safari Web Content",\r
+        "Safari",\r
+        "svn",\r
+        "DumpRenderTree",\r
+        "TestWebKitAPI Web Content",\r
+        "TestWebKitAPI",\r
+        "WebKitPluginAgen", # FIXME: Why no 't'?\r
+        "WebKitTestRunner Web Content",\r
+        "WebKitTestRunner",\r
+        "WebProcess",\r
+    ]\r
 \r
     if sys.platform == 'darwin':\r
         for task in tasksToKillMac:\r
index 7901761..6e88425 100644 (file)
@@ -1,3 +1,16 @@
+2011-07-20  Eric Seidel  <eric@webkit.org>
+
+        Make kill-old-processes kill httpd on mac
+        https://bugs.webkit.org/show_bug.cgi?id=64898
+
+        Reviewed by Adam Barth.
+
+        * BuildSlaveSupport/kill-old-processes:
+         - The line endings seem to have flipped again,
+           Thus making this diff gigantic.  The only line
+           changed is the "httpd" line.  I suspect we'll need
+           to set the line ending style from an svn checkout.
+
 2011-07-20  Ojan Vafai  <ojan@chromium.org>
 
         show a list of average test times in the treemap