[webkit-changes] [91421] trunk/Tools

[eric]

Title: [91421] trunk/Tools

Revision

91421

Author

e...@webkit.org

Date

2011-07-20 16:28:25 -0700 (Wed, 20 Jul 2011)

Log Message

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.

Modified Paths

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

Diff

Modified: trunk/Tools/BuildSlaveSupport/kill-old-processes (91420 => 91421)

--- trunk/Tools/BuildSlaveSupport/kill-old-processes	2011-07-20 23:25:33 UTC (rev 91420)
+++ trunk/Tools/BuildSlaveSupport/kill-old-processes	2011-07-20 23:28:25 UTC (rev 91421)
@@ -29,49 +29,50 @@
 def main():
     tasksToKillWin = [
         "cl.exe",
-		"devenv.com",
-		"devenv.exe",
-		"DumpRenderTree.exe",
-		"DumpRenderTree_debug.exe",
-		"httpd.exe",
-		"imagediff.exe",
-		"imagediff_debug.exe",
-		"jsc.exe",
-		"jsc_debug.exe",
-		"LightTPD.exe",
-		"link.exe",
-		"midl.exe",
-		"perl.exe",
-		"Safari.exe",
-		"svn.exe",
-		"testapi.exe",
-		"testapi_debug.exe",
-		"VcBuildHelper.exe",
-		"wdiff.exe",
-		"WebKit2WebProcess.exe",
-		"WebKit2WebProcess_debug.exe",
-		"WebKitTestRunner.exe",
-		"WebKitTestRunner_debug.exe",
-	]
+        "devenv.com",
+        "devenv.exe",
+        "DumpRenderTree.exe",
+        "DumpRenderTree_debug.exe",
+        "httpd.exe",
+        "imagediff.exe",
+        "imagediff_debug.exe",
+        "jsc.exe",
+        "jsc_debug.exe",
+        "LightTPD.exe",
+        "link.exe",
+        "midl.exe",
+        "perl.exe",
+        "Safari.exe",
+        "svn.exe",
+        "testapi.exe",
+        "testapi_debug.exe",
+        "VcBuildHelper.exe",
+        "wdiff.exe",
+        "WebKit2WebProcess.exe",
+        "WebKit2WebProcess_debug.exe",
+        "WebKitTestRunner.exe",
+        "WebKitTestRunner_debug.exe",
+    ]
 
     tasksToKillMac = [
-		"jsc",
-		"make",
-		"per5.12",
-		"perl",
-		"Problem Reporter",
-		"ruby",
-		"Safari Web Content",
-		"Safari",
-		"svn",
-		"DumpRenderTree",
-		"TestWebKitAPI Web Content",
-		"TestWebKitAPI",
-		"WebKitPluginAgen", # Why no 't'?
-		"WebKitTestRunner Web Content",
-		"WebKitTestRunner",
-		"WebProcess",
-	]
+        "httpd", # This shouldn't be needed, except currently there are bugs in NRWT's http locking code.
+        "jsc",
+        "make",
+        "per5.12",
+        "perl",
+        "Problem Reporter",
+        "ruby",
+        "Safari Web Content",
+        "Safari",
+        "svn",
+        "DumpRenderTree",
+        "TestWebKitAPI Web Content",
+        "TestWebKitAPI",
+        "WebKitPluginAgen", # FIXME: Why no 't'?
+        "WebKitTestRunner Web Content",
+        "WebKitTestRunner",
+        "WebProcess",
+    ]
 
     if sys.platform == 'darwin':
         for task in tasksToKillMac:

Modified: trunk/Tools/ChangeLog (91420 => 91421)

--- trunk/Tools/ChangeLog	2011-07-20 23:25:33 UTC (rev 91420)
+++ trunk/Tools/ChangeLog	2011-07-20 23:28:25 UTC (rev 91421)
@@ -1,3 +1,16 @@
+2011-07-20  Eric Seidel  <e...@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  <o...@chromium.org>
 
         show a list of average test times in the treemap

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes