summaryrefslogtreecommitdiff
path: root/Tools/WebKitTestRunner/TestInvocation.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-29 12:18:48 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-29 12:18:57 +0100
commit4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064 (patch)
treebed2fe914fe0f7ec70abfb47d2d84af8a3604d09 /Tools/WebKitTestRunner/TestInvocation.cpp
parent01485457c9a5da3f1121015afd25bb53af77662e (diff)
downloadqtwebkit-4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064.tar.gz
Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit.org/repository/webkit/trunk@136119)
New snapshot that includes the fix for installing the QtWebProcess into libexec Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Tools/WebKitTestRunner/TestInvocation.cpp')
-rw-r--r--Tools/WebKitTestRunner/TestInvocation.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/WebKitTestRunner/TestInvocation.cpp b/Tools/WebKitTestRunner/TestInvocation.cpp
index bad24fa61..8f66cc0dd 100644
--- a/Tools/WebKitTestRunner/TestInvocation.cpp
+++ b/Tools/WebKitTestRunner/TestInvocation.cpp
@@ -105,7 +105,7 @@ TestInvocation::TestInvocation(const std::string& pathOrURL)
, m_gotFinalMessage(false)
, m_gotRepaint(false)
, m_error(false)
- , m_webProcessIsUnrensponsive(false)
+ , m_webProcessIsUnresponsive(false)
{
}
@@ -213,7 +213,7 @@ void TestInvocation::invoke()
TestController::shared().runUntil(m_gotInitialResponse, TestController::ShortTimeout);
if (!m_gotInitialResponse) {
m_errorMessage = "Timed out waiting for initial response from web process\n";
- m_webProcessIsUnrensponsive = true;
+ m_webProcessIsUnresponsive = true;
goto end;
}
if (m_error)
@@ -229,7 +229,7 @@ void TestInvocation::invoke()
TestController::shared().runUntil(m_gotFinalMessage, TestController::shared().useWaitToDumpWatchdogTimer() ? TestController::LongTimeout : TestController::NoTimeout);
if (!m_gotFinalMessage) {
m_errorMessage = "Timed out waiting for final message from web process\n";
- m_webProcessIsUnrensponsive = true;
+ m_webProcessIsUnresponsive = true;
goto end;
}
if (m_error)
@@ -243,7 +243,7 @@ end:
WKInspectorClose(WKPageGetInspector(TestController::shared().mainWebView()->page()));
#endif // ENABLE(INSPECTOR)
- if (m_webProcessIsUnrensponsive)
+ if (m_webProcessIsUnresponsive)
dumpWebProcessUnresponsiveness();
else if (!TestController::shared().resetStateToConsistentValues()) {
m_errorMessage = "Timed out loading about:blank before the next test";