Title: [111642] trunk/Tools
- Revision
- 111642
- Author
- [email protected]
- Date
- 2012-03-21 19:26:20 -0700 (Wed, 21 Mar 2012)
Log Message
Customize layout test timeout value for different ports.
https://bugs.webkit.org/show_bug.cgi?id=79859
Reviewed by Ojan Vafai.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager):
* Scripts/webkitpy/layout_tests/port/base.py:
(Port.default_test_timeout_ms):
* Scripts/webkitpy/layout_tests/port/chromium.py:
(ChromiumDriver.stop):
* Scripts/webkitpy/layout_tests/port/chromium_android.py:
(ChromiumAndroidPort.default_test_timeout_ms):
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
(_set_up_derived_options):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111641 => 111642)
--- trunk/Tools/ChangeLog 2012-03-22 02:21:42 UTC (rev 111641)
+++ trunk/Tools/ChangeLog 2012-03-22 02:26:20 UTC (rev 111642)
@@ -1,3 +1,21 @@
+2012-03-21 Johnny Ding <[email protected]>
+
+ Customize layout test timeout value for different ports.
+ https://bugs.webkit.org/show_bug.cgi?id=79859
+
+ Reviewed by Ojan Vafai.
+
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (Manager):
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port.default_test_timeout_ms):
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ (ChromiumDriver.stop):
+ * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+ (ChromiumAndroidPort.default_test_timeout_ms):
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (_set_up_derived_options):
+
2012-03-21 Mark Rowe <[email protected]>
Fix the build.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (111641 => 111642)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2012-03-22 02:21:42 UTC (rev 111641)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2012-03-22 02:26:20 UTC (rev 111642)
@@ -284,12 +284,6 @@
"""A class for managing running a series of tests on a series of layout
test files."""
-
- # The per-test timeout in milliseconds, if no --time-out-ms option was
- # given to run_webkit_tests. This should correspond to the default timeout
- # in DumpRenderTree.
- DEFAULT_TEST_TIMEOUT_MS = 6 * 1000
-
def __init__(self, port, options, printer):
"""Initialize test runner data structures.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (111641 => 111642)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-03-22 02:21:42 UTC (rev 111641)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-03-22 02:26:20 UTC (rev 111642)
@@ -141,6 +141,9 @@
self._reftest_list = {}
self._results_directory = None
+ def default_test_timeout_ms(self):
+ return 6 * 1000
+
def wdiff_available(self):
if self._wdiff_available is None:
self._wdiff_available = self.check_wdiff(logging=False)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (111641 => 111642)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2012-03-22 02:21:42 UTC (rev 111641)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2012-03-22 02:26:20 UTC (rev 111642)
@@ -624,8 +624,8 @@
self._proc.stderr.close()
time_out_ms = self._port.get_option('time_out_ms')
if time_out_ms and not self._no_timeout:
- # FIXME: Port object shouldn't be dependent on layout test manager.
- kill_timeout_seconds = 3.0 * int(time_out_ms) / Manager.DEFAULT_TEST_TIMEOUT_MS
+ timeout_ratio = float(time_out_ms) / self._port.default_test_timeout_ms()
+ kill_timeout_seconds = 3.0 * timeout_ratio if timeout_ratio > 1.0 else 3.0
else:
kill_timeout_seconds = 3.0
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py (111641 => 111642)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-03-22 02:21:42 UTC (rev 111641)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-03-22 02:26:20 UTC (rev 111642)
@@ -153,6 +153,12 @@
if adb_args:
self._adb_command += shlex.split(adb_args)
+ def default_test_timeout_ms(self):
+ # Android platform has less computing power than desktop platforms.
+ # Using 10 seconds allows us to pass most slow tests which are not
+ # marked as slow tests on desktop platforms.
+ return 10 * 1000
+
def default_child_processes(self):
# Currently we only use one process, but it might be helpful to use
# more that one process in the future to improve performance.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (111641 => 111642)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-03-22 02:21:42 UTC (rev 111641)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-03-22 02:26:20 UTC (rev 111642)
@@ -156,9 +156,9 @@
if not options.time_out_ms:
if options.configuration == "Debug":
- options.time_out_ms = str(2 * Manager.DEFAULT_TEST_TIMEOUT_MS)
+ options.time_out_ms = str(2 * port.default_test_timeout_ms())
else:
- options.time_out_ms = str(Manager.DEFAULT_TEST_TIMEOUT_MS)
+ options.time_out_ms = str(port.default_test_timeout_ms())
options.slow_time_out_ms = str(5 * int(options.time_out_ms))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
