1 files changed, 10 insertions, 2 deletions
diff --git a/WebKitTools/WebKitTestRunner/TestInvocation.cpp b/WebKitTools/WebKitTestRunner/TestInvocation.cpp
index 04a56f1..e88de53 100644
--- a/WebKitTools/WebKitTestRunner/TestInvocation.cpp
+++ b/WebKitTools/WebKitTestRunner/TestInvocation.cpp
@@ -120,7 +120,11 @@ void TestInvocation::invoke()
     WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("BeginTest"));
     WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), 0);
 
-    TestController::runUntil(m_gotInitialResponse);
+    TestController::shared().runUntil(m_gotInitialResponse, TestController::ShortTimeout);
+    if (!m_gotInitialResponse) {
+        dump("Timed out waiting for initial response from web process\n");
+        return;
+    }
     if (m_error) {
         dump("FAIL\n");
         return;
@@ -128,7 +132,11 @@ void TestInvocation::invoke()
 
     WKPageLoadURL(TestController::shared().mainWebView()->page(), m_url.get());
 
-    TestController::runUntil(m_gotFinalMessage);
+    TestController::shared().runUntil(m_gotFinalMessage, TestController::LongTimeout);
+    if (!m_gotFinalMessage) {
+        dump("Timed out waiting for final message from web process\n");
+        return;
+    }
     if (m_error) {
         dump("FAIL\n");
         return;