Changeset 123643 in webkit

Timestamp:

Jul 25, 2012 12:10:15 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Fix timeout issues when debugging WebProcess.
​https://bugs.webkit.org/show_bug.cgi?id=92245

Patch by Christophe Dumez <Christophe Dumez> on 2012-07-25
Reviewed by Dirk Pranke.

Fix timeout issues when debugging the WebProcess
under valgrind or gdb.

• Scripts/webkitpy/layout_tests/port/efl.py:

(EflPort.default_timeout_ms):

• WebKitTestRunner/efl/TestControllerEfl.cpp:

(WTR::TestController::platformInitialize):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/efl.py (modified) (1 diff)
• WebKitTestRunner/efl/TestControllerEfl.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-25  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL][WK2] Fix timeout issues when debugging WebProcess.
+        https://bugs.webkit.org/show_bug.cgi?id=92245
+
+        Reviewed by Dirk Pranke.
+
+        Fix timeout issues when debugging the WebProcess
+        under valgrind or gdb.
+
+        * Scripts/webkitpy/layout_tests/port/efl.py:
+        (EflPort.default_timeout_ms):
+        * WebKitTestRunner/efl/TestControllerEfl.cpp:
+        (WTR::TestController::platformInitialize):
+
 2012-07-25  Xianzhu Wang  <wangxianzhu@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py

@@ -62 +62 @@
         return env
 
+    def default_timeout_ms(self):
+        # Tests run considerably slower under gdb
+        # or valgrind.
+        if self.get_option('webprocess_cmd_prefix'):
+            return 350 * 1000
+        return super(EflPort, self).default_timeout_ms()
+
     def clean_up_test_run(self):
         self._restore_pulseaudio_module()

trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp

@@ -51 +51 @@
 void TestController::platformInitialize()
 {
+    const char* isDebugging = getenv("WEB_PROCESS_CMD_PREFIX");
+    if (isDebugging && *isDebugging) {
+        m_useWaitToDumpWatchdogTimer = false;
+        m_forceNoTimeout = true;
+    }
 }