Title: [90448] trunk/Tools
- Revision
- 90448
- Author
- [email protected]
- Date
- 2011-07-06 03:28:20 -0700 (Wed, 06 Jul 2011)
Log Message
2011-07-06 Eric Seidel <[email protected]>
new-run-webkit-tests uses a 35s timeout for Mac and 6s for all other ports
https://bugs.webkit.org/show_bug.cgi?id=63983
Reviewed by Xan Lopez.
All WebKit ports want to use a 35s timeout. Only chromium currently
uses a 6s timeout. Eventually we'll move all WebKit ports to 6s too
to further speed up new-run-webkit-tests runs, but that's going to be a while.
* Scripts/webkitpy/layout_tests/port/mac.py:
* Scripts/webkitpy/layout_tests/port/webkit.py:
* Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90447 => 90448)
--- trunk/Tools/ChangeLog 2011-07-06 10:13:02 UTC (rev 90447)
+++ trunk/Tools/ChangeLog 2011-07-06 10:28:20 UTC (rev 90448)
@@ -1,3 +1,18 @@
+2011-07-06 Eric Seidel <[email protected]>
+
+ new-run-webkit-tests uses a 35s timeout for Mac and 6s for all other ports
+ https://bugs.webkit.org/show_bug.cgi?id=63983
+
+ Reviewed by Xan Lopez.
+
+ All WebKit ports want to use a 35s timeout. Only chromium currently
+ uses a 6s timeout. Eventually we'll move all WebKit ports to 6s too
+ to further speed up new-run-webkit-tests runs, but that's going to be a while.
+
+ * Scripts/webkitpy/layout_tests/port/mac.py:
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+ * Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+
2011-07-06 Xan Lopez <[email protected]>
Unreviewed.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py (90447 => 90448)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-07-06 10:13:02 UTC (rev 90447)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-07-06 10:28:20 UTC (rev 90448)
@@ -83,8 +83,6 @@
self._version = port_name[len('mac-'):]
assert self._version in self.SUPPORTED_VERSIONS, "%s is not in %s" % (self._version, self.SUPPORTED_VERSIONS)
self._operating_system = 'mac'
- if not hasattr(self._options, 'time-out-ms') or self._options.time_out_ms is None:
- self._options.time_out_ms = 35000
def baseline_search_path(self):
return map(self._webkit_baseline_path, self.FALLBACK_PATHS[self._version])
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (90447 => 90448)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-07-06 10:13:02 UTC (rev 90447)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-07-06 10:28:20 UTC (rev 90448)
@@ -51,8 +51,10 @@
base.Port.__init__(self, **kwargs)
self._cached_apache_path = None # FIXME: This class should use @memoized instead.
- # FIXME: disable pixel tests until they are run by default on the build machines.
+ # FIXME: Disable pixel tests until they are run by default on build.webkit.org.
self.set_option_default("pixel_tests", False)
+ # WebKit ports expect a 35s timeout, or 350s timeout when running with -g/--guard-malloc.
+ self.set_option_default("time_out_ms", 35000)
def driver_name(self):
if self.get_option('webkit_test_runner'):
@@ -389,6 +391,7 @@
cmd.append('--complex-text')
if self._port.get_option('threaded'):
cmd.append('--threaded')
+ # FIXME: We need to pass --timeout=SECONDS to WebKitTestRunner for WebKit2.
cmd.extend(self._port.get_option('additional_drt_flag', []))
cmd.append('-')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (90447 => 90448)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-07-06 10:13:02 UTC (rev 90447)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-07-06 10:28:20 UTC (rev 90448)
@@ -63,6 +63,21 @@
return ["accessibility", ]
+class WebKitPortUnitTests(unittest.TestCase):
+ def test_default_options(self):
+ # The WebKit ports override new-run-webkit-test default options.
+ options = MockOptions(pixel_tests=None, time_out_ms=None)
+ port = WebKitPort(options=options)
+ self.assertEquals(port._options.pixel_tests, False)
+ self.assertEquals(port._options.time_out_ms, 35000)
+
+ # Note that we don't override options if specified by the user.
+ options = MockOptions(pixel_tests=True, time_out_ms=6000)
+ port = WebKitPort(options=options)
+ self.assertEquals(port._options.pixel_tests, True)
+ self.assertEquals(port._options.time_out_ms, 6000)
+
+
class WebKitPortTest(port_testcase.PortTestCase):
def port_maker(self, platform):
return WebKitPort
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
