Changeset 182916 in webkit

Timestamp:

Apr 16, 2015 3:54:46 PM (9 years ago)

Author:

ap@apple.com

Message:

It is very hard to attach a debugger to WebProcess to debug tests
​https://bugs.webkit.org/show_bug.cgi?id=143837

Reviewed by Chris Dumez.

--no-timeout used to only affect waitUntilDone timeout, but not IPC timeout in
WebKitTestRunner, and not pipe reading timeout in run-webkit-tests.

Now it disables all timeouts in tools, as is best for debugging tests.

• Scripts/webkitpy/port/driver.py: (Driver.run_test): Respect --no-timeout, so

that the script doesn't terminate DRT/WKTR when there is no output for a long time.

• WebKitTestRunner/Options.cpp: Removed --no-timeout-at-all, as --no-timeout

now has the same functionality.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/driver.py (modified) (1 diff)
• WebKitTestRunner/Options.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-04-16  Alexey Proskuryakov  <ap@apple.com>
+
+        It is very hard to attach a debugger to WebProcess to debug tests
+        https://bugs.webkit.org/show_bug.cgi?id=143837
+
+        Reviewed by Chris Dumez.
+
+        --no-timeout used to only affect waitUntilDone timeout, but not IPC timeout in
+        WebKitTestRunner, and not pipe reading timeout in run-webkit-tests.
+
+        Now it disables all timeouts in tools, as is best for debugging tests.
+
+        * Scripts/webkitpy/port/driver.py: (Driver.run_test): Respect --no-timeout, so
+        that the script doesn't terminate DRT/WKTR when there is no output for a long time.
+
+        * WebKitTestRunner/Options.cpp: Removed --no-timeout-at-all, as --no-timeout
+        now has the same functionality.
+
 2015-04-16  Beth Dakin  <bdakin@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/driver.py

@@ -187 +187 @@
         # FIXME: It's not the job of the driver to decide what the timeouts should be.
         # Move the additional timeout to driver_input.
-        deadline = test_begin_time + int(driver_input.timeout) / 1000.0 + 5
+        if self._no_timeout:
+            deadline = test_begin_time + 60 * 60 * 24 * 7  # 7 days. Using sys.maxint causes a hang.
+        else:
+            deadline = test_begin_time + int(driver_input.timeout) / 1000.0 + 5
 
         self._server_process.write(command)

trunk/Tools/WebKitTestRunner/Options.cpp

@@ -46 +46 @@
 
 bool handleOptionNoTimeout(Options& options, const char*, const char*)
-{
-    options.useWaitToDumpWatchdogTimer = false;
-    return true;
-}
-
-bool handleOptionNoTimeoutAtAll(Options& options, const char*, const char*)
 {
     options.useWaitToDumpWatchdogTimer = false;
@@ -117 +111 @@
     : options(o)
 {
-    optionList.append(Option("--no-timeout", "Disables waitUntilDone timeout.", handleOptionNoTimeout));
-    optionList.append(Option("--no-timeout-at-all", "Disables all timeouts.", handleOptionNoTimeoutAtAll));
+    optionList.append(Option("--no-timeout", "Disables all timeouts.", handleOptionNoTimeout));
     optionList.append(Option("--verbose", "Turns on messages.", handleOptionVerbose));
     optionList.append(Option("--gc-between-tests", "Garbage collection between tests.", handleOptionGcBetweenTests));