<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200346] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200346">200346</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-02 16:14:01 -0700 (Mon, 02 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add the ability to accumulate logs for specific logging channels to help diagnose test timeouts.
https://bugs.webkit.org/show_bug.cgi?id=157274
Reviewed by Alex Christensen.
Source/WebCore:
* platform/Logging.cpp:
(WebCore::setLogChannelToAccumulate): Set the given log channel to accumulate logging,
and dirty the initializeLoggingChannelsIfNecessary flag.
(WebCore::initializeLoggingChannelsIfNecessary): Change from being a one-time-only call to a
one-time-for-each-time-somebody-calls-setLogChannelToAccumulate call.
* platform/Logging.h:
* testing/js/WebCoreTestSupport.cpp:
(WebCoreTestSupport::setLogChannelToAccumulate):
(WebCoreTestSupport::initializeLoggingChannelsIfNecessary):
* testing/js/WebCoreTestSupport.h:
Source/WTF:
This patch changes WTFLog to add the logging string to the logging accumulator if the logging channel says so.
It also adds support for using this new accumulation mechanism.
* WTF.xcodeproj/project.pbxproj:
* wtf/Assertions.cpp:
(WTF::resetAccumulatedLogs):
(WTF::getAndResetAccumulatedLogs):
* wtf/Assertions.h:
* wtf/LoggingAccumulator.h: Added. Expose functions to get accumulated logs and to reset the accumulation.
* wtf/text/WTFString.cpp:
(WTF::String::format): Update to handle %@ on CF (Well, really ObjC) platforms.
Tools:
Add the new accumulate method to DRT's TestRunner, dump the accumulated logs if there's a timeout,
and reset them in between tests:
* DumpRenderTree/TestRunner.cpp:
(accummulateLogsForChannel):
(TestRunner::staticFunctions):
(TestRunner::waitToDumpWatchdogTimerFired):
(TestRunner::setAccummulateLogsForChannel):
* DumpRenderTree/TestRunner.h:
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebViewToConsistentStateBeforeTesting):
Also add the new method to WKTR's TestRunner, but just stubbed for now:
* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::accummulateLogsForChannel):
* WebKitTestRunner/InjectedBundle/TestRunner.h:
LayoutTests:
For the tests that are known flakes that are not imported, add the "accumulate IndexedDB logs" command.
* storage/indexeddb/modern/resources/256-open-databases.js:
* storage/indexeddb/modern/resources/abort-requests-cancelled.js:
* storage/indexeddb/modern/resources/autoincrement-abort.js:
* storage/indexeddb/resources/intversion-open-in-upgradeneeded.js:
* storage/indexeddb/resources/odd-strings.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresources256opendatabasesjs">trunk/LayoutTests/storage/indexeddb/modern/resources/256-open-databases.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesabortrequestscancelledjs">trunk/LayoutTests/storage/indexeddb/modern/resources/abort-requests-cancelled.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesautoincrementabortjs">trunk/LayoutTests/storage/indexeddb/modern/resources/autoincrement-abort.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourcesintversionopeninupgradeneededjs">trunk/LayoutTests/storage/indexeddb/resources/intversion-open-in-upgradeneeded.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourcesoddstringsjs">trunk/LayoutTests/storage/indexeddb/resources/odd-strings.js</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWTFwtfAssertionscpp">trunk/Source/WTF/wtf/Assertions.cpp</a></li>
<li><a href="#trunkSourceWTFwtfAssertionsh">trunk/Source/WTF/wtf/Assertions.h</a></li>
<li><a href="#trunkSourceWTFwtftextWTFStringcpp">trunk/Source/WTF/wtf/text/WTFString.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformLoggingcpp">trunk/Source/WebCore/platform/Logging.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLoggingh">trunk/Source/WebCore/platform/Logging.h</a></li>
<li><a href="#trunkSourceWebCoretestingjsWebCoreTestSupportcpp">trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingjsWebCoreTestSupporth">trunk/Source/WebCore/testing/js/WebCoreTestSupport.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnercpp">trunk/Tools/DumpRenderTree/TestRunner.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnerh">trunk/Tools/DumpRenderTree/TestRunner.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfLoggingAccumulatorh">trunk/Source/WTF/wtf/LoggingAccumulator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/LayoutTests/ChangeLog 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-02 Brady Eidson <beidson@apple.com>
+
+ Add the ability to accumulate logs for specific logging channels to help diagnose test timeouts.
+ https://bugs.webkit.org/show_bug.cgi?id=157274
+
+ Reviewed by Alex Christensen.
+
+ For the tests that are known flakes that are not imported, add the "accumulate IndexedDB logs" command.
+
+ * storage/indexeddb/modern/resources/256-open-databases.js:
+ * storage/indexeddb/modern/resources/abort-requests-cancelled.js:
+ * storage/indexeddb/modern/resources/autoincrement-abort.js:
+ * storage/indexeddb/resources/intversion-open-in-upgradeneeded.js:
+ * storage/indexeddb/resources/odd-strings.js:
+
</ins><span class="cx"> 2016-05-02 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win] Enable IndexedDB.
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresources256opendatabasesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/resources/256-open-databases.js (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/256-open-databases.js 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/256-open-databases.js 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -1,5 +1,8 @@
</span><span class="cx"> description("This test makes sure that if you open 128 unique databases, close your connections to them, and then open 128 other unique databases, that it works.");
</span><span class="cx">
</span><ins>+if (window.testRunner)
+ testRunner.accummulateLogsForChannel("IndexedDB");
+
</ins><span class="cx"> var databaseConnections = new Array;
</span><span class="cx">
</span><span class="cx"> for (var i = 0; i < 128; ++i) {
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesabortrequestscancelledjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/resources/abort-requests-cancelled.js (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/abort-requests-cancelled.js 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/abort-requests-cancelled.js 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -1,8 +1,10 @@
</span><span class="cx"> description("This test makes sure that un-handled requests in a transaction receive onerror callbacks when the transaction is aborted.");
</span><span class="cx">
</span><ins>+if (window.testRunner)
+ testRunner.accummulateLogsForChannel("IndexedDB");
+
</ins><span class="cx"> indexedDBTest(prepareDatabase);
</span><span class="cx">
</span><del>-
</del><span class="cx"> function done()
</span><span class="cx"> {
</span><span class="cx"> finishJSTest();
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesautoincrementabortjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/resources/autoincrement-abort.js (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/autoincrement-abort.js 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/autoincrement-abort.js 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -3,9 +3,11 @@
</span><span class="cx"> But it then aborts that transaction. \
</span><span class="cx"> Then it opens a new one and puts something in it, double checking that the key generator was reverted when the above transaction was aborted.");
</span><span class="cx">
</span><ins>+if (window.testRunner)
+ testRunner.accummulateLogsForChannel("IndexedDB");
+
</ins><span class="cx"> indexedDBTest(prepareDatabase);
</span><span class="cx">
</span><del>-
</del><span class="cx"> function done()
</span><span class="cx"> {
</span><span class="cx"> finishJSTest();
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourcesintversionopeninupgradeneededjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/resources/intversion-open-in-upgradeneeded.js (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/intversion-open-in-upgradeneeded.js 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/LayoutTests/storage/indexeddb/resources/intversion-open-in-upgradeneeded.js 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -5,6 +5,9 @@
</span><span class="cx">
</span><span class="cx"> description("Test calling db.open in upgradeneeded.");
</span><span class="cx">
</span><ins>+if (window.testRunner)
+ testRunner.accummulateLogsForChannel("IndexedDB");
+
</ins><span class="cx"> function test()
</span><span class="cx"> {
</span><span class="cx"> removeVendorPrefixes();
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourcesoddstringsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/resources/odd-strings.js (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/odd-strings.js 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/LayoutTests/storage/indexeddb/resources/odd-strings.js 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -5,6 +5,9 @@
</span><span class="cx">
</span><span class="cx"> description("Test IndexedDB odd value datatypes");
</span><span class="cx">
</span><ins>+if (window.testRunner)
+ testRunner.accummulateLogsForChannel("IndexedDB");
+
</ins><span class="cx"> function test()
</span><span class="cx"> {
</span><span class="cx"> removeVendorPrefixes();
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Source/WTF/ChangeLog 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-05-02 Brady Eidson <beidson@apple.com>
+
+ Add the ability to accumulate logs for specific logging channels to help diagnose test timeouts.
+ https://bugs.webkit.org/show_bug.cgi?id=157274
+
+ Reviewed by Alex Christensen.
+
+ This patch changes WTFLog to add the logging string to the logging accumulator if the logging channel says so.
+ It also adds support for using this new accumulation mechanism.
+
+ * WTF.xcodeproj/project.pbxproj:
+
+ * wtf/Assertions.cpp:
+ (WTF::resetAccumulatedLogs):
+ (WTF::getAndResetAccumulatedLogs):
+ * wtf/Assertions.h:
+
+ * wtf/LoggingAccumulator.h: Added. Expose functions to get accumulated logs and to reset the accumulation.
+
+ * wtf/text/WTFString.cpp:
+ (WTF::String::format): Update to handle %@ on CF (Well, really ObjC) platforms.
+
</ins><span class="cx"> 2016-05-02 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win] Enable IndexedDB.
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> 2CDED0F318115C85004DBA70 /* RunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CDED0F118115C85004DBA70 /* RunLoop.cpp */; };
</span><span class="cx"> 2CDED0F418115C85004DBA70 /* RunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CDED0F218115C85004DBA70 /* RunLoop.h */; };
</span><span class="cx"> 430B47891AAAAC1A001223DA /* StringCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 430B47871AAAAC1A001223DA /* StringCommon.h */; };
</span><ins>+ 513E170B1CD7D5BF00E3650B /* LoggingAccumulator.h in Headers */ = {isa = PBXBuildFile; fileRef = 513E170A1CD7D5BF00E3650B /* LoggingAccumulator.h */; };
</ins><span class="cx"> 553071CA1C40427200384898 /* TinyLRUCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 553071C91C40427200384898 /* TinyLRUCache.h */; };
</span><span class="cx"> 70A993FE1AD7151300FA615B /* SymbolRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70A993FC1AD7151300FA615B /* SymbolRegistry.cpp */; };
</span><span class="cx"> 70A993FF1AD7151300FA615B /* SymbolRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 70A993FD1AD7151300FA615B /* SymbolRegistry.h */; };
</span><span class="lines">@@ -411,6 +412,7 @@
</span><span class="cx"> 2CDED0F118115C85004DBA70 /* RunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoop.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2CDED0F218115C85004DBA70 /* RunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoop.h; sourceTree = "<group>"; };
</span><span class="cx"> 430B47871AAAAC1A001223DA /* StringCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringCommon.h; sourceTree = "<group>"; };
</span><ins>+ 513E170A1CD7D5BF00E3650B /* LoggingAccumulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoggingAccumulator.h; sourceTree = "<group>"; };
</ins><span class="cx"> 553071C91C40427200384898 /* TinyLRUCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TinyLRUCache.h; sourceTree = "<group>"; };
</span><span class="cx"> 5D247B6214689B8600E78B76 /* libWTF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 5D247B6E14689C4700E78B76 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -835,6 +837,7 @@
</span><span class="cx"> 0FE164681B6FFC9600400E7C /* Lock.cpp */,
</span><span class="cx"> 0FE164691B6FFC9600400E7C /* Lock.h */,
</span><span class="cx"> A8A472C3151A825A004123FF /* Locker.h */,
</span><ins>+ 513E170A1CD7D5BF00E3650B /* LoggingAccumulator.h */,
</ins><span class="cx"> A8A472C6151A825A004123FF /* MainThread.cpp */,
</span><span class="cx"> A8A472C7151A825B004123FF /* MainThread.h */,
</span><span class="cx"> 1A233C7C17DAA6E300A93ACF /* MallocPtr.h */,
</span><span class="lines">@@ -1249,6 +1252,7 @@
</span><span class="cx"> A8A47415151A825B004123FF /* RandomNumber.h in Headers */,
</span><span class="cx"> A8A47416151A825B004123FF /* RandomNumberSeed.h in Headers */,
</span><span class="cx"> 0F725CAC1C50461600AD943A /* RangeSet.h in Headers */,
</span><ins>+ 513E170B1CD7D5BF00E3650B /* LoggingAccumulator.h in Headers */,
</ins><span class="cx"> 0F87105A16643F190090B0AD /* RawPointer.h in Headers */,
</span><span class="cx"> A8A47417151A825B004123FF /* RedBlackTree.h in Headers */,
</span><span class="cx"> 26299B6E17A9E5B800ADEBE5 /* Ref.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.cpp (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.cpp 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -35,14 +35,18 @@
</span><span class="cx"> #include "Assertions.h"
</span><span class="cx">
</span><span class="cx"> #include "Compiler.h"
</span><ins>+#include <mutex>
+#include <stdio.h>
+#include <string.h>
+#include <wtf/Lock.h>
+#include <wtf/Locker.h>
+#include <wtf/LoggingAccumulator.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><ins>+#include <wtf/text/StringBuilder.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#include <stdio.h>
-#include <string.h>
-
</del><span class="cx"> #if HAVE(SIGNAL_H)
</span><span class="cx"> #include <signal.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -76,6 +80,14 @@
</span><span class="cx">
</span><span class="cx"> extern "C" {
</span><span class="cx">
</span><ins>+static void logToStderr(const char* buffer)
+{
+#if USE(APPLE_SYSTEM_LOG)
+ asl_log(0, 0, ASL_LEVEL_NOTICE, "%s", buffer);
+#endif
+ fputs(buffer, stderr);
+}
+
</ins><span class="cx"> WTF_ATTRIBUTE_PRINTF(1, 0)
</span><span class="cx"> static void vprintf_stderr_common(const char* format, va_list args)
</span><span class="cx"> {
</span><span class="lines">@@ -96,10 +108,7 @@
</span><span class="cx">
</span><span class="cx"> CFStringGetCString(str, buffer, length, kCFStringEncodingUTF8);
</span><span class="cx">
</span><del>-#if USE(APPLE_SYSTEM_LOG)
- asl_log(0, 0, ASL_LEVEL_NOTICE, "%s", buffer);
-#endif
- fputs(buffer, stderr);
</del><ins>+ logToStderr(buffer);
</ins><span class="cx">
</span><span class="cx"> free(buffer);
</span><span class="cx"> CFRelease(str);
</span><span class="lines">@@ -412,15 +421,83 @@
</span><span class="cx"> printCallSite(file, line, function);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class WTFLoggingAccumulator {
+public:
+ void accumulate(const String&);
+ void resetAccumulatedLogs();
+ String getAndResetAccumulatedLogs();
+
+private:
+ Lock accumulatorLock;
+ StringBuilder loggingAccumulator;
+};
+
+void WTFLoggingAccumulator::accumulate(const String& log)
+{
+ Locker<Lock> locker(accumulatorLock);
+ loggingAccumulator.append(log);
+}
+
+void WTFLoggingAccumulator::resetAccumulatedLogs()
+{
+ Locker<Lock> locker(accumulatorLock);
+ loggingAccumulator.clear();
+}
+
+String WTFLoggingAccumulator::getAndResetAccumulatedLogs()
+{
+ Locker<Lock> locker(accumulatorLock);
+ String result = loggingAccumulator.toString();
+ loggingAccumulator.clear();
+ return result;
+}
+
+static WTFLoggingAccumulator& loggingAccumulator()
+{
+ static WTFLoggingAccumulator* accumulator;
+ static std::once_flag initializeAccumulatorOnce;
+ std::call_once(initializeAccumulatorOnce, [] {
+ accumulator = new WTFLoggingAccumulator;
+ });
+
+ return *accumulator;
+}
+
</ins><span class="cx"> void WTFLog(WTFLogChannel* channel, const char* format, ...)
</span><span class="cx"> {
</span><del>- if (channel->state != WTFLogChannelOn)
</del><ins>+ if (channel->state == WTFLogChannelOff)
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (channel->state == WTFLogChannelOn) {
+ va_list args;
+ va_start(args, format);
+ vprintf_stderr_with_trailing_newline(format, args);
+ va_end(args);
+ return;
+ }
+
+ ASSERT(channel->state == WTFLogChannelOnWithAccumulation);
+
</ins><span class="cx"> va_list args;
</span><span class="cx"> va_start(args, format);
</span><del>- vprintf_stderr_with_trailing_newline(format, args);
</del><ins>+
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+ String loggingString = String::format(format, args);
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
</ins><span class="cx"> va_end(args);
</span><ins>+
+ if (!loggingString.endsWith('\n'))
+ loggingString.append('\n');
+
+ loggingAccumulator().accumulate(loggingString);
+
+ logToStderr(loggingString.utf8().data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChannel* channel, const char* format, ...)
</span><span class="lines">@@ -430,7 +507,16 @@
</span><span class="cx">
</span><span class="cx"> va_list args;
</span><span class="cx"> va_start(args, format);
</span><del>- vprintf_stderr_with_trailing_newline(format, args);
</del><ins>+
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+ WTFLog(channel, format, args);
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
</ins><span class="cx"> va_end(args);
</span><span class="cx">
</span><span class="cx"> printCallSite(file, line, function);
</span><span class="lines">@@ -503,3 +589,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // extern "C"
</span><ins>+
+namespace WTF {
+
+void resetAccumulatedLogs()
+{
+ loggingAccumulator().resetAccumulatedLogs();
+}
+
+String getAndResetAccumulatedLogs()
+{
+ return loggingAccumulator().getAndResetAccumulatedLogs();
+}
+
+} // namespace WTF
</ins></span></pre></div>
<a id="trunkSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.h (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.h 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Source/WTF/wtf/Assertions.h 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> #define NO_RETURN_DUE_TO_CRASH
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-typedef enum { WTFLogChannelOff, WTFLogChannelOn } WTFLogChannelState;
</del><ins>+typedef enum { WTFLogChannelOff, WTFLogChannelOn, WTFLogChannelOnWithAccumulation } WTFLogChannelState;
</ins><span class="cx">
</span><span class="cx"> typedef struct {
</span><span class="cx"> WTFLogChannelState state;
</span></span></pre></div>
<a id="trunkSourceWTFwtfLoggingAccumulatorh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/LoggingAccumulator.h (0 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/LoggingAccumulator.h (rev 0)
+++ trunk/Source/WTF/wtf/LoggingAccumulator.h 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/text/WTFString.h>
+
+namespace WTF {
+
+WTF_EXPORT_PRIVATE void resetAccumulatedLogs();
+WTF_EXPORT_PRIVATE String getAndResetAccumulatedLogs();
+
+} // namespace WTF
+
+using WTF::resetAccumulatedLogs;
+using WTF::getAndResetAccumulatedLogs;
</ins></span></pre></div>
<a id="trunkSourceWTFwtftextWTFStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/WTFString.cpp (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/WTFString.cpp 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Source/WTF/wtf/text/WTFString.cpp 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -463,6 +463,24 @@
</span><span class="cx"> va_list args;
</span><span class="cx"> va_start(args, format);
</span><span class="cx">
</span><ins>+#if USE(CF) && !OS(WINDOWS)
+ if (strstr(format, "%@")) {
+ RetainPtr<CFStringRef> cfFormat = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, format, kCFStringEncodingUTF8));
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+ RetainPtr<CFStringRef> result = adoptCF(CFStringCreateWithFormatAndArguments(kCFAllocatorDefault, nullptr, cfFormat.get(), args));
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
+ va_end(args);
+ return result.get();
+ }
+#endif // USE(CF) && !OS(WINDOWS)
+
</ins><span class="cx"> // Do the format once to get the length.
</span><span class="cx"> #if COMPILER(MSVC)
</span><span class="cx"> int result = _vscprintf(format, args);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Source/WebCore/ChangeLog 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-05-02 Brady Eidson <beidson@apple.com>
+
+ Add the ability to accumulate logs for specific logging channels to help diagnose test timeouts.
+ https://bugs.webkit.org/show_bug.cgi?id=157274
+
+ Reviewed by Alex Christensen.
+
+ * platform/Logging.cpp:
+ (WebCore::setLogChannelToAccumulate): Set the given log channel to accumulate logging,
+ and dirty the initializeLoggingChannelsIfNecessary flag.
+ (WebCore::initializeLoggingChannelsIfNecessary): Change from being a one-time-only call to a
+ one-time-for-each-time-somebody-calls-setLogChannelToAccumulate call.
+ * platform/Logging.h:
+
+ * testing/js/WebCoreTestSupport.cpp:
+ (WebCoreTestSupport::setLogChannelToAccumulate):
+ (WebCoreTestSupport::initializeLoggingChannelsIfNecessary):
+ * testing/js/WebCoreTestSupport.h:
+
</ins><span class="cx"> 2016-05-02 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Sort the project file.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Logging.cpp (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Logging.cpp 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Source/WebCore/platform/Logging.cpp 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -57,13 +57,25 @@
</span><span class="cx"> return channel->state != WTFLogChannelOff;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool logChannelsNeedInitialization = true;
+
+void setLogChannelToAccumulate(const String& name)
+{
+ WTFLogChannel* channel = WTFLogChannelByName(logChannels, logChannelCount, name.utf8().data());
+ if (!channel)
+ return;
+
+ channel->state = WTFLogChannelOnWithAccumulation;
+ logChannelsNeedInitialization = true;
+}
+
</ins><span class="cx"> void initializeLoggingChannelsIfNecessary()
</span><span class="cx"> {
</span><del>- static bool haveInitializedLoggingChannels = false;
- if (haveInitializedLoggingChannels)
</del><ins>+ if (!logChannelsNeedInitialization)
</ins><span class="cx"> return;
</span><del>- haveInitializedLoggingChannels = true;
</del><span class="cx">
</span><ins>+ logChannelsNeedInitialization = false;
+
</ins><span class="cx"> WTFInitializeLogChannelStatesFromString(logChannels, logChannelCount, logLevelString().utf8().data());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Logging.h (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Logging.h 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Source/WebCore/platform/Logging.h 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx">
</span><span class="cx"> String logLevelString();
</span><span class="cx"> bool isLogChannelEnabled(const String& name);
</span><ins>+WEBCORE_EXPORT void setLogChannelToAccumulate(const String& name);
</ins><span class="cx"> WEBCORE_EXPORT void initializeLoggingChannelsIfNecessary();
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void registerNotifyCallback(const String& notifyID, std::function<void()> callback);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingjsWebCoreTestSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "Internals.h"
</span><span class="cx"> #include "JSDocument.h"
</span><span class="cx"> #include "JSInternals.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "WheelEventTestTrigger.h"
</span><span class="cx"> #include <JavaScriptCore/APICast.h>
</span><span class="lines">@@ -97,4 +98,20 @@
</span><span class="cx"> page->clearTrigger();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void setLogChannelToAccumulate(const String& name)
+{
+#if !LOG_DISABLED
+ WebCore::setLogChannelToAccumulate(name);
+#else
+ UNUSED_PARAM(name);
+#endif
</ins><span class="cx"> }
</span><ins>+
+void initializeLoggingChannelsIfNecessary()
+{
+#if !LOG_DISABLED
+ WebCore::initializeLoggingChannelsIfNecessary();
+#endif
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoretestingjsWebCoreTestSupporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.h (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/js/WebCoreTestSupport.h 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupport.h 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -35,6 +35,10 @@
</span><span class="cx"> #define TEST_SUPPORT_EXPORT
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+namespace WTF {
+class String;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> class Frame;
</span><span class="cx"> }
</span><span class="lines">@@ -47,6 +51,9 @@
</span><span class="cx"> void setTestCallbackAndStartNotificationTimer(WebCore::Frame&, JSContextRef, JSObjectRef) TEST_SUPPORT_EXPORT;
</span><span class="cx"> void clearWheelEventTestTrigger(WebCore::Frame&) TEST_SUPPORT_EXPORT;
</span><span class="cx">
</span><ins>+void setLogChannelToAccumulate(const WTF::String& name) TEST_SUPPORT_EXPORT;
+void initializeLoggingChannelsIfNecessary() TEST_SUPPORT_EXPORT;
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Tools/ChangeLog 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-05-02 Brady Eidson <beidson@apple.com>
+
+ Add the ability to accumulate logs for specific logging channels to help diagnose test timeouts.
+ https://bugs.webkit.org/show_bug.cgi?id=157274
+
+ Reviewed by Alex Christensen.
+
+ Add the new accumulate method to DRT's TestRunner, dump the accumulated logs if there's a timeout,
+ and reset them in between tests:
+ * DumpRenderTree/TestRunner.cpp:
+ (accummulateLogsForChannel):
+ (TestRunner::staticFunctions):
+ (TestRunner::waitToDumpWatchdogTimerFired):
+ (TestRunner::setAccummulateLogsForChannel):
+ * DumpRenderTree/TestRunner.h:
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebViewToConsistentStateBeforeTesting):
+
+ Also add the new method to WKTR's TestRunner, but just stubbed for now:
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::accummulateLogsForChannel):
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+
</ins><span class="cx"> 2016-05-02 Srinivasan Vijayaraghavan <svijayaraghavan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add fail-fast option to run-javascriptcore-tests
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestRunner.h"
</span><span class="cx">
</span><ins>+#include "WebCoreTestSupport.h"
</ins><span class="cx"> #include "WorkQueue.h"
</span><span class="cx"> #include "WorkQueueItem.h"
</span><span class="cx"> #include <JavaScriptCore/APICast.h>
</span><span class="lines">@@ -37,6 +38,7 @@
</span><span class="cx"> #include <JavaScriptCore/JSCTestRunnerUtils.h>
</span><span class="cx"> #include <JavaScriptCore/JSObjectRef.h>
</span><span class="cx"> #include <JavaScriptCore/JSRetainPtr.h>
</span><ins>+#include <WebCore/Logging.h>
</ins><span class="cx"> #include <cstring>
</span><span class="cx"> #include <locale.h>
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span><span class="lines">@@ -45,9 +47,11 @@
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><ins>+#include <wtf/LoggingAccumulator.h>
</ins><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> #include <Carbon/Carbon.h>
</span><span class="lines">@@ -1968,6 +1972,20 @@
</span><span class="cx"> return JSC::setNeverInline(context, arguments[0]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static JSValueRef accummulateLogsForChannel(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ if (argumentCount < 1)
+ return JSValueMakeUndefined(context);
+
+ JSRetainPtr<JSStringRef> channel(Adopt, JSValueToStringCopy(context, arguments[0], exception));
+ ASSERT(!*exception);
+
+ TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
+ controller->setAccummulateLogsForChannel(channel.get());
+
+ return JSValueMakeUndefined(context);
+}
+
</ins><span class="cx"> static void testRunnerObjectFinalize(JSObjectRef object)
</span><span class="cx"> {
</span><span class="cx"> TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(object));
</span><span class="lines">@@ -2172,6 +2190,7 @@
</span><span class="cx"> { "failNextNewCodeBlock", failNextNewCodeBlock, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "numberOfDFGCompiles", numberOfDFGCompiles, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "neverInlineFunction", neverInlineFunction, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><ins>+ { "accummulateLogsForChannel", accummulateLogsForChannel, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</ins><span class="cx"> { 0, 0, 0 }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -2222,6 +2241,13 @@
</span><span class="cx"> {
</span><span class="cx"> const char* message = "FAIL: Timed out waiting for notifyDone to be called\n";
</span><span class="cx"> fprintf(stdout, "%s", message);
</span><ins>+
+ auto accumulatedLogs = getAndResetAccumulatedLogs();
+ if (!accumulatedLogs.isEmpty()) {
+ const char* message = "Logs accumulated during test run:\n";
+ fprintf(stdout, "%s%s\n", message, accumulatedLogs.utf8().data());
+ }
+
</ins><span class="cx"> notifyDone();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2252,3 +2278,12 @@
</span><span class="cx"> {
</span><span class="cx"> m_shouldPaintBrokenImage = shouldPaintBrokenImage;
</span><span class="cx"> }
</span><ins>+
+void TestRunner::setAccummulateLogsForChannel(JSStringRef channel)
+{
+ size_t maxLength = JSStringGetMaximumUTF8CStringSize(channel);
+ auto buffer = std::make_unique<char[]>(maxLength + 1);
+ JSStringGetUTF8CString(channel, buffer.get(), maxLength + 1);
+
+ WebCoreTestSupport::setLogChannelToAccumulate({ buffer.get() });
+}
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.h (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.h 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Tools/DumpRenderTree/TestRunner.h 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -135,6 +135,8 @@
</span><span class="cx"> void setTextAutosizingEnabled(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void setAccummulateLogsForChannel(JSStringRef);
+
</ins><span class="cx"> // Legacy here refers to the old TestRunner API for handling web notifications, not the legacy web notification API.
</span><span class="cx"> void ignoreLegacyWebNotificationPermissionRequests();
</span><span class="cx"> // Legacy here refers to the old TestRunner API for handling web notifications, not the legacy web notification API.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> #import <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #import <JavaScriptCore/HeapStatistics.h>
</span><span class="cx"> #import <JavaScriptCore/Options.h>
</span><ins>+#import <WebCore/Logging.h>
</ins><span class="cx"> #import <WebKit/DOMElement.h>
</span><span class="cx"> #import <WebKit/DOMExtensions.h>
</span><span class="cx"> #import <WebKit/DOMRange.h>
</span><span class="lines">@@ -86,6 +87,7 @@
</span><span class="cx"> #import <getopt.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/FastMalloc.h>
</span><ins>+#import <wtf/LoggingAccumulator.h>
</ins><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/Threading.h>
</span><span class="lines">@@ -1894,6 +1896,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> [mainFrame _clearOpener];
</span><ins>+
+ resetAccumulatedLogs();
+ WebCoreTestSupport::initializeLoggingChannelsIfNecessary();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -223,5 +223,7 @@
</span><span class="cx"> void runUIScript(DOMString script, object callback);
</span><span class="cx">
</span><span class="cx"> void clearTestRunnerCallbacks();
</span><ins>+
+ void accummulateLogsForChannel(DOMString channel);
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -601,6 +601,11 @@
</span><span class="cx"> callbackMap().clear();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TestRunner::accummulateLogsForChannel(JSStringRef)
+{
+ // FIXME: Implement getting the call to all processes.
+}
+
</ins><span class="cx"> void TestRunner::addChromeInputField(JSValueRef callback)
</span><span class="cx"> {
</span><span class="cx"> cacheTestRunnerCallback(AddChromeInputFieldCallbackID, callback);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (200345 => 200346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-05-02 23:07:21 UTC (rev 200345)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-05-02 23:14:01 UTC (rev 200346)
</span><span class="lines">@@ -320,6 +320,8 @@
</span><span class="cx">
</span><span class="cx"> void clearTestRunnerCallbacks();
</span><span class="cx">
</span><ins>+ void accummulateLogsForChannel(JSStringRef channel);
+
</ins><span class="cx"> private:
</span><span class="cx"> TestRunner();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>