Title: [120852] trunk/Tools
- Revision
- 120852
- Author
- [email protected]
- Date
- 2012-06-20 12:53:21 -0700 (Wed, 20 Jun 2012)
Log Message
Fix chromium win http servers after breakage introduced in r120846.
Unreviewed, build fix.
* Scripts/webkitpy/layout_tests/port/base.py:
(Port.to.start_http_server):
* Scripts/webkitpy/layout_tests/servers/http_server.py:
(Lighttpd.__init__):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (120851 => 120852)
--- trunk/Tools/ChangeLog 2012-06-20 19:47:23 UTC (rev 120851)
+++ trunk/Tools/ChangeLog 2012-06-20 19:53:21 UTC (rev 120852)
@@ -1,5 +1,16 @@
2012-06-20 Dirk Pranke <[email protected]>
+ Fix chromium win http servers after breakage introduced in r120846.
+
+ Unreviewed, build fix.
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port.to.start_http_server):
+ * Scripts/webkitpy/layout_tests/servers/http_server.py:
+ (Lighttpd.__init__):
+
+2012-06-20 Dirk Pranke <[email protected]>
+
tweak output of webkit-patch print-{baselines,expectations}
https://bugs.webkit.org/show_bug.cgi?id=89588
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (120851 => 120852)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-06-20 19:47:23 UTC (rev 120851)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-06-20 19:53:21 UTC (rev 120852)
@@ -795,7 +795,7 @@
if self._uses_apache():
server = apache_http_server.LayoutTestApacheHttpd(self, self.results_directory(), additional_dirs=additional_dirs, number_of_servers=number_of_servers)
else:
- server = http_server.Lighttpd(self, self.results_directory(), additional_dirs=additional_dirs, num_servers=num_servers)
+ server = http_server.Lighttpd(self, self.results_directory(), additional_dirs=additional_dirs, number_of_servers=number_of_servers)
server.start()
self._http_server = server
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py (120851 => 120852)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2012-06-20 19:47:23 UTC (rev 120851)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2012-06-20 19:53:21 UTC (rev 120852)
@@ -43,12 +43,12 @@
def __init__(self, port_obj, output_dir, background="" port=None,
root=None, run_background=None, additional_dirs=None,
- layout_tests_dir=None, num_servers=None):
+ layout_tests_dir=None, number_of_servers=None):
"""Args:
output_dir: the absolute path to the layout test result directory
"""
# Webkit tests
- http_server_base.HttpServerBase.__init__(self, port_obj, num_servers)
+ http_server_base.HttpServerBase.__init__(self, port_obj, number_of_servers)
self._name = 'lighttpd'
self._output_dir = output_dir
self._port = port
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
