Title: [118421] trunk/Tools
Revision
118421
Author
[email protected]
Date
2012-05-24 15:03:33 -0700 (Thu, 24 May 2012)

Log Message

[NRWT] REGRESSION(r116021): Assertion when running with --no-http
https://bugs.webkit.org/show_bug.cgi?id=86800

Patch by Thiago Marcos P. Santos <[email protected]> on 2012-05-24
Reviewed by Dirk Pranke.

Don't launch a HTTP server with lock based only on the existence of
locked shards since we now run perf on locked shards too.

* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager._run_tests):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (118420 => 118421)


--- trunk/Tools/ChangeLog	2012-05-24 21:47:47 UTC (rev 118420)
+++ trunk/Tools/ChangeLog	2012-05-24 22:03:33 UTC (rev 118421)
@@ -1,3 +1,16 @@
+2012-05-24  Thiago Marcos P. Santos  <[email protected]>
+
+        [NRWT] REGRESSION(r116021): Assertion when running with --no-http
+        https://bugs.webkit.org/show_bug.cgi?id=86800
+
+        Reviewed by Dirk Pranke.
+
+        Don't launch a HTTP server with lock based only on the existence of
+        locked shards since we now run perf on locked shards too.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager._run_tests):
+
 2012-05-24  Jochen Eisinger  <[email protected]>
 
         Add --driver-name option to run_webkit_tests.py to allow for selecting alternative DRT binaries

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (118420 => 118421)


--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py	2012-05-24 21:47:47 UTC (rev 118420)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py	2012-05-24 22:03:33 UTC (rev 118421)
@@ -740,7 +740,7 @@
 
         all_shards = locked_shards + unlocked_shards
         self._remaining_locked_shards = locked_shards
-        if locked_shards:
+        if locked_shards and self._options.http:
             self.start_servers_with_lock()
 
         num_workers = min(num_workers, len(all_shards))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to