Changeset 152295 in webkit

Timestamp:

Jul 2, 2013 9:19:05 AM (11 years ago)

Author:

bw80.lee@samsung.com

Message:

Fix WebKitTestRunner crashes.
​https://bugs.webkit.org/show_bug.cgi?id=117630

Reviewed by Darin Adler.

Create static function to dump for WebProcess unresponsiveness status,
and use it before calling TestController::runTest().

Accessing TestController::m_currentInvocation before calling
TestController::runTest() can make crash because the invocation
instance will be assigned at the function.

• WebKitTestRunner/TestController.cpp:

(WTR::TestController::run):

• WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::dumpWebProcessUnresponsiveness):

• WebKitTestRunner/TestInvocation.h:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/TestController.cpp (modified) (1 diff)
• WebKitTestRunner/TestInvocation.cpp (modified) (2 diffs)
• WebKitTestRunner/TestInvocation.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-07-02  Byungwoo Lee  <bw80.lee@samsung.com>
+
+        Fix WebKitTestRunner crashes.
+        https://bugs.webkit.org/show_bug.cgi?id=117630
+
+        Reviewed by Darin Adler.
+
+        Create static function to dump for WebProcess unresponsiveness status,
+        and use it before calling TestController::runTest().
+
+        Accessing TestController::m_currentInvocation before calling
+        TestController::runTest() can make crash because the invocation
+        instance will be assigned at the function.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::run):
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::dumpWebProcessUnresponsiveness):
+        * WebKitTestRunner/TestInvocation.h:
+
 2013-07-02  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -755 +755 @@
 {
     if (!resetStateToConsistentValues()) {
-        m_currentInvocation->dumpWebProcessUnresponsiveness();
+        TestInvocation::dumpWebProcessUnresponsiveness("<unknown> - TestController::run - Failed to reset state to consistent values\n");
         return;
     }

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -277 +277 @@
 void TestInvocation::dumpWebProcessUnresponsiveness()
 {
+    dumpWebProcessUnresponsiveness(m_errorMessage.c_str());
+}
+
+void TestInvocation::dumpWebProcessUnresponsiveness(const char* errorMessage)
+{
     const char* errorMessageToStderr = 0;
 #if PLATFORM(MAC)
@@ -287 +292 @@
 #endif
 
-    dump(m_errorMessage.c_str(), errorMessageToStderr, true);
+    dump(errorMessage, errorMessageToStderr, true);
 }
 

trunk/Tools/WebKitTestRunner/TestInvocation.h

@@ -50 +50 @@
 
     void dumpWebProcessUnresponsiveness();
+    static void dumpWebProcessUnresponsiveness(const char* errorMessage);
     void outputText(const WTF::String&);
 private: