WebKit Bugzilla
Attachment 348851 Details for
Bug 189063
: REGRESSION(r235408): GTK bots exiting early
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-189063-20180904150339.patch (text/plain), 3.73 KB, created by
Simon Fraser (smfr)
on 2018-09-04 15:03:39 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Simon Fraser (smfr)
Created:
2018-09-04 15:03:39 PDT
Size:
3.73 KB
patch
obsolete
>Subversion Revision: 235632 >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 78cb21285b155ee05075a60ecd848243b1042128..9d05485590d8787ce42559270488f513ef1d8e29 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,26 @@ >+2018-09-04 Simon Fraser <simon.fraser@apple.com> >+ >+ REGRESSION(r235408): GTK bots exiting early >+ https://bugs.webkit.org/show_bug.cgi?id=189063 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ WebKitTestRunner was running the world leak checks even when run without --world-leaks, >+ causing GTK bot timeouts. So guard updateLiveDocumentsAfterTest(), checkForWorldLeaks() >+ and findAndDumpWorldLeaks() with m_checkForWorldLeaks checks, and in >+ TestController::handleControlCommand() print a message if the control script sends the >+ "#CHECK FOR WORLD LEAKS" command if WTR was not run with --world-leaks. >+ >+ I tested that running with --world-leaks still works. >+ >+ * WebKitTestRunner/TestController.cpp: >+ (WTR::TestController::resetStateToConsistentValues): >+ (WTR::TestController::updateLiveDocumentsAfterTest): >+ (WTR::TestController::checkForWorldLeaks): >+ (WTR::TestController::findAndDumpWorldLeaks): >+ (WTR::TestController::handleControlCommand): >+ (WTR::TestController::run): >+ > 2018-09-04 Chris Dumez <cdumez@apple.com> > > Add process pool configuration flag to turn on automatic process pre-warming >diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp >index 7cdaaf0a869abac2ba66d57fbfeea2d732791a4f..cff8d6a48d0634a5775339d861be12fcbe078444 100644 >--- a/Tools/WebKitTestRunner/TestController.cpp >+++ b/Tools/WebKitTestRunner/TestController.cpp >@@ -933,7 +933,7 @@ bool TestController::resetStateToConsistentValues(const TestOptions& options, Re > if (!m_doneResetting) > return false; > >- if (resetStage == ResetStage::AfterTest && m_checkForWorldLeaks) >+ if (resetStage == ResetStage::AfterTest) > updateLiveDocumentsAfterTest(); > > return m_doneResetting; >@@ -941,6 +941,9 @@ bool TestController::resetStateToConsistentValues(const TestOptions& options, Re > > void TestController::updateLiveDocumentsAfterTest() > { >+ if (!m_checkForWorldLeaks) >+ return; >+ > AsyncTask([]() { > // After each test, we update the list of live documents so that we can detect when an abandoned document first showed up. > WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("GetLiveDocuments")); >@@ -950,7 +953,7 @@ void TestController::updateLiveDocumentsAfterTest() > > void TestController::checkForWorldLeaks() > { >- if (!TestController::singleton().mainWebView()) >+ if (!m_checkForWorldLeaks || !TestController::singleton().mainWebView()) > return; > > AsyncTask([]() { >@@ -962,6 +965,9 @@ void TestController::checkForWorldLeaks() > > void TestController::findAndDumpWorldLeaks() > { >+ if (!m_checkForWorldLeaks) >+ return; >+ > checkForWorldLeaks(); > > StringBuilder builder; >@@ -1390,6 +1396,10 @@ bool TestController::waitForCompletion(const WTF::Function<void ()>& function, W > bool TestController::handleControlCommand(const char* command) > { > if (!strcmp("#CHECK FOR WORLD LEAKS", command)) { >+ if (!m_checkForWorldLeaks) { >+ WTFLogAlways("WebKitTestRunner asked to check for world leaks, but was not run with --world-leaks"); >+ return true; >+ } > findAndDumpWorldLeaks(); > return true; > } >@@ -1424,7 +1434,8 @@ void TestController::run() > if (!runTest(m_paths[i].c_str())) > break; > } >- findAndDumpWorldLeaks(); >+ if (m_checkForWorldLeaks) >+ findAndDumpWorldLeaks(); > } > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 189063
: 348851