2011-04-06 Dirk Pranke <dpranke@chromium.org>

        Reviewed by Tony Chang.

        Adjust the apple webkit port's default timeout to match
        old-run-webkit-tests at 35 seconds.

        https://bugs.webkit.org/show_bug.cgi?id=37738

        * Scripts/webkitpy/layout_tests/port/mac.py:

git-svn-id: svn://svn.chromium.org/blink/trunk@83130 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Tools/ChangeLog

+2011-04-06  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Adjust the apple webkit port's default timeout to match
+        old-run-webkit-tests at 35 seconds.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37738
+
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+
 2011-04-06  Scott Cameron  <sccameron@rim.com>
 
         Reviewed by Eric Seidel.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mac.py

@@ -81,8 +81,9 @@ class MacPort(WebKitPort):
         else:
             self._version = port_name[4:]
             assert self._version in 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 default_child_processes(self):
         # FIXME: new-run-webkit-tests is unstable on Mac running more than