Attachment 346750 Details for Bug 188389 – Patch

[patch] Patch

bug-188389-20180807191923.patch (text/plain), 1.65 KB, created by Sihui Liu on 2018-08-07 19:19:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-08-07 19:19:23 PDT

Size: 1.65 KB

patch

obsolete

>Subversion Revision: 234635
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 2e6ffe1072a052e26eb56a508ecf212e5b14c8ba..3f8063586263ede361a6f7314d014e410c05c09b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-08-07  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Avoid timeout resulted from calling waitUntilDone when test is not running
>+        https://bugs.webkit.org/show_bug.cgi?id=188389
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        If test is not running, we should not set the waitUntilDone flag, or it may cause subsequent tests timeout.
>+
>+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
>+        (WTR::TestRunner::waitUntilDone):
>+
> 2018-08-06  David Quesada  <david_quesada@apple.com>
> 
>         webkitdirs.pm should default to iPhone SE for 64-bit testing
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>index 27f0dd285b540ecff45825c63ee9dfd5972ce95a..6db33f0cd2c8a12d1a76da84df762b893bc09fcc 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>@@ -185,9 +185,12 @@ void TestRunner::waitUntilDownloadFinished()
> 
> void TestRunner::waitUntilDone()
> {
>+    auto& injectedBundle = InjectedBundle::singleton();
>+    ASSERT(!injectedBundle.isTestRunning());
>+
>     setWaitUntilDone(true);
>     // FIXME: Watchdog timer should be moved to UI process in order to take the elapsed time in anotehr process into account.
>-    if (InjectedBundle::singleton().useWaitToDumpWatchdogTimer())
>+    if (injectedBundle.useWaitToDumpWatchdogTimer())
>         initializeWaitToDumpWatchdogTimerIfNeeded();
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188389: 346727 | 346750 | 346850 | 346854 | 346856 | 347039