Title: [244129] branches/safari-607-branch/Tools
Revision
244129
Author
[email protected]
Date
2019-04-10 10:11:21 -0700 (Wed, 10 Apr 2019)

Log Message

Cherry-pick r243870. rdar://problem/49725697

    Unreviewed, roll out r243858 which made tests time out.

    Disable new API tests on Windows instead.

    * TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp:
    (TestWebKitAPI::TEST):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-607-branch/Tools/ChangeLog (244128 => 244129)


--- branches/safari-607-branch/Tools/ChangeLog	2019-04-10 17:11:18 UTC (rev 244128)
+++ branches/safari-607-branch/Tools/ChangeLog	2019-04-10 17:11:21 UTC (rev 244129)
@@ -1,5 +1,27 @@
 2019-04-09  Alan Coon  <[email protected]>
 
+        Cherry-pick r243870. rdar://problem/49725697
+
+    Unreviewed, roll out r243858 which made tests time out.
+    
+    Disable new API tests on Windows instead.
+    
+    * TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp:
+    (TestWebKitAPI::TEST):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243870 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-04-04  Chris Dumez  <[email protected]>
+
+            Unreviewed, roll out r243858 which made tests time out.
+
+            Disable new API tests on Windows instead.
+
+            * TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp:
+            (TestWebKitAPI::TEST):
+
+2019-04-09  Alan Coon  <[email protected]>
+
         Cherry-pick r243858. rdar://problem/49725697
 
     The page's focusedFrame / frameSetLargestFrame do not get cleared on process swap or crash

Modified: branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp (244128 => 244129)


--- branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp	2019-04-10 17:11:18 UTC (rev 244128)
+++ branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp	2019-04-10 17:11:21 UTC (rev 244129)
@@ -91,6 +91,8 @@
     Util::run(&loadAfterCrash);
 }
 
+#if !PLATFORM(WIN)
+
 static void nullJavaScriptCallback(WKSerializedScriptValueRef, WKErrorRef, void*)
 {
 }
@@ -133,7 +135,7 @@
     while (!WKPageGetFocusedFrame(webView.page()))
         Util::spinRunLoop(10);
 
-    WKPageTerminate(webView.page());
+    kill(WKPageGetProcessIdentifier(webView.page()), 9);
 
     Util::run(&calledCrashHandler);
 }
@@ -163,11 +165,13 @@
     while (!WKPageGetFrameSetLargestFrame(webView.page()))
         Util::spinRunLoop(10);
 
-    WKPageTerminate(webView.page());
+    kill(WKPageGetProcessIdentifier(webView.page()), 9);
 
     Util::run(&calledCrashHandler);
 }
 
+#endif // !PLATFORM(WIN)
+
 } // namespace TestWebKitAPI
 
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to