From 0f7e57b5ef162bacc8d7e0444735262f122a68ec Mon Sep 17 00:00:00 2001 From: Alicia Boya Garcia Date: Tue, 25 Apr 2023 09:12:55 -0700 Subject: [PATCH] [WTR] Watchdog timer should not default to zero seconds https://bugs.webkit.org/show_bug.cgi?id=255920 Reviewed by Carlos Garcia Campos. TestInvocation::m_timeout can have two special values: zero, for a default timeout, and -1 for no timeout. The current implementation of initializeWaitToDumpWatchdogTimerIfNeeded() was not taking this into consideration, which caused tests to immediately timeout (0 second timeout) when invoking WebKitTestRunner without --no-timeout. * Tools/WebKitTestRunner/TestInvocation.cpp: (WTR::TestInvocation::initializeWaitToDumpWatchdogTimerIfNeeded): Canonical link: https://commits.webkit.org/263374@main --- Tools/WebKitTestRunner/TestInvocation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/WebKitTestRunner/TestInvocation.cpp b/Tools/WebKitTestRunner/TestInvocation.cpp index 4f3134f86abf..afe653da8d0d 100644 --- a/Tools/WebKitTestRunner/TestInvocation.cpp +++ b/Tools/WebKitTestRunner/TestInvocation.cpp @@ -1756,10 +1756,10 @@ void TestInvocation::dumpPrivateClickMeasurement() void TestInvocation::initializeWaitToDumpWatchdogTimerIfNeeded() { - if (m_waitToDumpWatchdogTimer.isActive()) + if (m_waitToDumpWatchdogTimer.isActive() || m_timeout == TestController::noTimeout) return; - m_waitToDumpWatchdogTimer.startOneShot(m_timeout); + m_waitToDumpWatchdogTimer.startOneShot(m_timeout > 0_s ? m_timeout : TestController::defaultShortTimeout); } void TestInvocation::invalidateWaitToDumpWatchdogTimer()