Attachment 347039 Details for Bug 188389 – Patch for landing

[patch] Patch for landing

bug-188389-20180813143721.patch (text/plain), 1.63 KB, created by Sihui Liu on 2018-08-13 14:37:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-08-13 14:37:22 PDT

Size: 1.63 KB

patch

obsolete

>Subversion Revision: 234805
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index c49660591afac7b56667f5278e5fbe2f15e40c1d..a77483bd837d3d0122c4147949dfd87283c523f5 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-08-13  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 Chris Dumez.
>+
>+        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-13  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][Floating] Add basic clearance support
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>index 27f0dd285b540ecff45825c63ee9dfd5972ce95a..8ea9301ffea8f5e96fa3ff40f522fac484f41de2 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();
>+    RELEASE_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