Diff
Modified: trunk/Tools/ChangeLog (90513 => 90514)
--- trunk/Tools/ChangeLog 2011-07-06 23:34:21 UTC (rev 90513)
+++ trunk/Tools/ChangeLog 2011-07-06 23:37:12 UTC (rev 90514)
@@ -1,3 +1,20 @@
+2011-07-06 Mihai Parparita <[email protected]>
+
+ Unreviewed, rolling out r90503.
+ http://trac.webkit.org/changeset/90503
+ https://bugs.webkit.org/show_bug.cgi?id=63358
+
+ Makes Chromium Windows canary bots hang.
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
2011-07-06 Adam Barth <[email protected]>
Move buildbot URL in webkitpy to config.urls
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (90513 => 90514)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-07-06 23:34:21 UTC (rev 90513)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-07-06 23:37:12 UTC (rev 90514)
@@ -135,6 +135,7 @@
self._test_configuration = None
self._multiprocessing_is_available = (multiprocessing is not None)
self._results_directory = None
+ self.set_option_default('use_apache', self._default_to_apache())
def executive(self):
return self._executive
@@ -221,7 +222,7 @@
return True
def check_httpd(self):
- if self._uses_apache():
+ if self.get_option('use_apache'):
path = self._path_to_apache()
else:
path = self._path_to_lighttpd()
@@ -644,7 +645,7 @@
Ports can stub this out if they don't need a web server to be running."""
assert not self._http_server, 'Already running an http server.'
- if self._uses_apache():
+ if self.get_option('use_apache'):
server = apache_http_server.LayoutTestApacheHttpd(self, self.results_directory())
else:
server = http_server.Lighttpd(self, self.results_directory())
@@ -833,7 +834,10 @@
def _webkit_build_directory(self, args):
return self._config.build_directory(args[0])
- def _uses_apache(self):
+ def _default_to_apache(self):
+ """Override if the port should use LigHTTPd instead of Apache by default.
+
+ Ports that override start_http_server() ignore this method."""
return True
def _path_to_apache(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (90513 => 90514)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-07-06 23:34:21 UTC (rev 90513)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-07-06 23:37:12 UTC (rev 90514)
@@ -118,8 +118,6 @@
return result
def check_sys_deps(self, needs_http):
- result = super(ChromiumPort, self).check_sys_deps(needs_http)
-
cmd = [self._path_to_driver(), '--check-layout-test-sys-deps']
local_error = executive.ScriptError()
@@ -134,7 +132,7 @@
_log.error('')
_log.error(output)
return False
- return result
+ return True
def check_image_diff(self, override_step=None, logging=True):
image_diff_path = self._path_to_image_diff()
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py (90513 => 90514)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-07-06 23:34:21 UTC (rev 90513)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-07-06 23:37:12 UTC (rev 90514)
@@ -94,6 +94,11 @@
def check_build(self, needs_http):
result = chromium.ChromiumPort.check_build(self, needs_http)
+ if needs_http:
+ if self.get_option('use_apache'):
+ result = self._check_apache_install() and result
+ else:
+ result = self._check_lighttpd_install() and result
result = self.check_wdiff() and result
if not result:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py (90513 => 90514)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-07-06 23:34:21 UTC (rev 90513)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-07-06 23:37:12 UTC (rev 90514)
@@ -55,7 +55,6 @@
class ChromiumWinPort(chromium.ChromiumPort):
"""Chromium Win implementation of the Port class."""
-
# FIXME: Figure out how to unify this with base.TestConfiguration.all_systems()?
SUPPORTED_VERSIONS = ('xp', 'vista', 'win7')
@@ -130,7 +129,7 @@
return p
return self._filesystem.join(self.path_from_webkit_base(), 'Source', 'WebKit', 'chromium', *comps)
- def _uses_apache(self):
+ def _default_to_apache(self):
return False
def _lighttpd_path(self, *comps):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py (90513 => 90514)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2011-07-06 23:34:21 UTC (rev 90513)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2011-07-06 23:37:12 UTC (rev 90514)
@@ -58,13 +58,6 @@
def _mock_path_from_chromium_base(self, *comps):
return self._port._filesystem.join("/chromium/src", *comps)
- def test_uses_apache(self):
- port = self.make_port()
- if not port:
- return
-
- self.assertFalse(port._uses_apache())
-
def test_setup_environ_for_server(self):
port = self.make_port()
if not port:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py (90513 => 90514)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py 2011-07-06 23:34:21 UTC (rev 90513)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py 2011-07-06 23:37:12 UTC (rev 90514)
@@ -40,7 +40,8 @@
from webkitpy.layout_tests.port import test
from webkitpy.tool import mocktool
-mock_options = mocktool.MockOptions(configuration='Release')
+mock_options = mocktool.MockOptions(use_apache=True,
+ configuration='Release')
class MockDRTPortTest(port_testcase.PortTestCase):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py (90513 => 90514)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py 2011-07-06 23:34:21 UTC (rev 90513)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py 2011-07-06 23:37:12 UTC (rev 90514)
@@ -89,13 +89,6 @@
self.assertTrue('--foo=bar' in cmd_line)
self.assertTrue('--foo=baz' in cmd_line)
- def test_uses_apache(self):
- port = self.make_port()
- if not port:
- return
-
- self.assertTrue(port._uses_apache())
-
def assert_servers_are_down(self, host, ports):
for port in ports:
try:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (90513 => 90514)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-07-06 23:34:21 UTC (rev 90513)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-07-06 23:37:12 UTC (rev 90514)
@@ -149,6 +149,9 @@
if options.pixel_tests is None:
options.pixel_tests = True
+ if not options.use_apache:
+ options.use_apache = sys.platform.startswith('linux') or sys.platform == 'darwin'
+
if not options.time_out_ms:
if options.configuration == "Debug":
options.time_out_ms = str(2 * manager.Manager.DEFAULT_TEST_TIMEOUT_MS)
@@ -374,6 +377,8 @@
# instead of --force:
optparse.make_option("--force", action="" default=False,
help="Run all tests, even those marked SKIP in the test list"),
+ optparse.make_option("--use-apache", action=""
+ default=False, help="Whether to use apache instead of lighttpd."),
optparse.make_option("--time-out-ms",
help="Set the timeout for each test"),
# old-run-webkit-tests calls --randomize-order --random:
