Title: [123643] trunk/Tools
- Revision
- 123643
- Author
- [email protected]
- Date
- 2012-07-25 12:10:15 -0700 (Wed, 25 Jul 2012)
Log Message
[EFL][WK2] Fix timeout issues when debugging WebProcess.
https://bugs.webkit.org/show_bug.cgi?id=92245
Patch by Christophe Dumez <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (123642 => 123643)
--- trunk/Tools/ChangeLog 2012-07-25 18:52:28 UTC (rev 123642)
+++ trunk/Tools/ChangeLog 2012-07-25 19:10:15 UTC (rev 123643)
@@ -1,3 +1,18 @@
+2012-07-25 Christophe Dumez <[email protected]>
+
+ [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 <[email protected]>
[Chromium-Android] NRWT driver should not restart between reftests
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py (123642 => 123643)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py 2012-07-25 18:52:28 UTC (rev 123642)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py 2012-07-25 19:10:15 UTC (rev 123643)
@@ -61,6 +61,13 @@
env['WEB_PROCESS_CMD_PREFIX'] = self.webprocess_cmd_prefix
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()
Modified: trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp (123642 => 123643)
--- trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp 2012-07-25 18:52:28 UTC (rev 123642)
+++ trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp 2012-07-25 19:10:15 UTC (rev 123643)
@@ -50,6 +50,11 @@
void TestController::platformInitialize()
{
+ const char* isDebugging = getenv("WEB_PROCESS_CMD_PREFIX");
+ if (isDebugging && *isDebugging) {
+ m_useWaitToDumpWatchdogTimer = false;
+ m_forceNoTimeout = true;
+ }
}
void TestController::platformRunUntil(bool& condition, double timeout)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
