Title: [121384] trunk/Tools
- Revision
- 121384
- Author
- [email protected]
- Date
- 2012-06-27 16:49:47 -0700 (Wed, 27 Jun 2012)
Log Message
nrwt: default timeout for debug bots broke in r121363
https://bugs.webkit.org/show_bug.cgi?id=90112
Unreviewed, build fix.
I forgot to account for release and debug having different
default values :(.
* Scripts/webkitpy/layout_tests/port/chromium.py:
(ChromiumPort.default_test_timeout_ms):
* Scripts/webkitpy/layout_tests/port/webkit.py:
(WebKitPort):
(WebKitPort.default_test_timeout_ms):
* Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
(WebKitPortUnitTests.test_default_options):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121383 => 121384)
--- trunk/Tools/ChangeLog 2012-06-27 23:27:48 UTC (rev 121383)
+++ trunk/Tools/ChangeLog 2012-06-27 23:49:47 UTC (rev 121384)
@@ -1,5 +1,23 @@
2012-06-27 Dirk Pranke <[email protected]>
+ nrwt: default timeout for debug bots broke in r121363
+ https://bugs.webkit.org/show_bug.cgi?id=90112
+
+ Unreviewed, build fix.
+
+ I forgot to account for release and debug having different
+ default values :(.
+
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ (ChromiumPort.default_test_timeout_ms):
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+ (WebKitPort):
+ (WebKitPort.default_test_timeout_ms):
+ * Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+ (WebKitPortUnitTests.test_default_options):
+
+2012-06-27 Dirk Pranke <[email protected]>
+
webkitpy: fix a couple of issues running under cygwin
https://bugs.webkit.org/show_bug.cgi?id=90035
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (121383 => 121384)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2012-06-27 23:27:48 UTC (rev 121383)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2012-06-27 23:49:47 UTC (rev 121384)
@@ -52,7 +52,6 @@
class ChromiumPort(WebKitPort):
"""Abstract base class for Chromium implementations of the Port class."""
pixel_tests_option_default = True
- time_out_ms_option_default = 6 * 1000
ALL_SYSTEMS = (
('leopard', 'x86'),
@@ -113,6 +112,9 @@
# All sub-classes override this, but we need an initial value for testing.
self._chromium_base_dir_path = None
+ def default_test_timeout_ms(self):
+ return 6 * 1000
+
def _check_file_exists(self, path_to_file, file_description,
override_step=None, logging=True):
"""Verify the file is present where expected or log an error.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (121383 => 121384)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2012-06-27 23:27:48 UTC (rev 121383)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2012-06-27 23:49:47 UTC (rev 121384)
@@ -52,16 +52,20 @@
class WebKitPort(Port):
pixel_tests_option_default = False # FIXME: Disable until they are run by default on build.webkit.org.
- time_out_ms_option_default = 35 * 1000
def __init__(self, host, port_name=None, **kwargs):
Port.__init__(self, host, port_name=port_name, **kwargs)
self.set_option_default("pixel_tests", self.pixel_tests_option_default)
- # FIXME: --guard-malloc is only supported on Mac, so this logic should be in mac.py.
+ def default_test_timeout_ms(self):
if self.get_option('guard_malloc'):
- self.time_out_ms_option_default = 350 * 1000
- self.set_option_default("time_out_ms", self.time_out_ms_option_default)
+ # FIXME: --guard-malloc is only supported on Mac, so this logic should be in mac.py.
+ return 350 * 1000
+ if self.get_option.configuration == 'Debug':
+ # FIXME: the generic code in run_webkit_tests.py multiplies this by 2 :(.
+ # We want to use the same timeout for both release and debug.
+ return 17.5 * 1000
+ return 35 * 1000
def driver_name(self):
if self.get_option('webkit_test_runner'):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (121383 => 121384)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2012-06-27 23:27:48 UTC (rev 121383)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2012-06-27 23:49:47 UTC (rev 121384)
@@ -66,16 +66,14 @@
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)
+ options = MockOptions(pixel_tests=None)
port = WebKitPort(MockSystemHost(), 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)
+ options = MockOptions(pixel_tests=True)
port = WebKitPort(MockSystemHost(), options=options)
self.assertEquals(port._options.pixel_tests, True)
- self.assertEquals(port._options.time_out_ms, 6000)
class WebKitPortTest(port_testcase.PortTestCase):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
