<!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>[208004] trunk/LayoutTests</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/208004">208004</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-27 14:14:50 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sync up all copies of testharnessreport.js
https://bugs.webkit.org/show_bug.cgi?id=164071
Reviewed by Youenn Fablet.
Sync up all copies of testharnessreport.js for consistency.
* http/tests/media/media-source/mediasource-play-then-seek-back-with-remote-control-expected.txt:
* http/tests/security/cross-origin-css-in-quirks-1-expected.txt:
* http/tests/security/cross-origin-css-in-quirks-2-expected.txt:
* http/tests/security/cross-origin-css-in-quirks-3-expected.txt:
* http/tests/security/cross-origin-css-in-quirks-4-expected.txt:
* http/tests/security/same-origin-css-1-expected.txt:
* http/tests/security/same-origin-css-2-expected.txt:
* http/tests/security/same-origin-css-3-expected.txt:
* http/tests/security/same-origin-css-in-quirks-expected.txt:
* http/tests/w3c/resources/testharnessreport.js:
(convertResult):
(self.testRunner.add_completion_callback.):
(self.testRunner.add_completion_callback):
(add_completion_callback.sanitize): Deleted.
(add_completion_callback): Deleted.
* imported/blink/http/tests/resources/testharnessreport.js:
(convertResult):
(self.testRunner.add_completion_callback.):
(self.testRunner.add_completion_callback):
(isCSSWGTest): Deleted.
(isJSTest): Deleted.
(add_completion_callback.sanitize): Deleted.
(add_completion_callback.done): Deleted.
(add_completion_callback): Deleted.
* resources/testharnessreport.js:
(self.testRunner.add_completion_callback.):
(self.testRunner.add_completion_callback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsmediamediasourcemediasourceplaythenseekbackwithremotecontrolexpectedtxt">trunk/LayoutTests/http/tests/media/media-source/mediasource-play-then-seek-back-with-remote-control-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossorigincss1expectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-css-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossorigincss2expectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-css-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossorigincss3expectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-css-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossorigincssinquirks1expectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossorigincssinquirks2expectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossorigincssinquirks3expectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossorigincssinquirks4expectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-4-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritysameorigincss1expectedtxt">trunk/LayoutTests/http/tests/security/same-origin-css-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritysameorigincss2expectedtxt">trunk/LayoutTests/http/tests/security/same-origin-css-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritysameorigincss3expectedtxt">trunk/LayoutTests/http/tests/security/same-origin-css-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritysameorigincssinquirksexpectedtxt">trunk/LayoutTests/http/tests/security/same-origin-css-in-quirks-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsw3cresourcestestharnessreportjs">trunk/LayoutTests/http/tests/w3c/resources/testharnessreport.js</a></li>
<li><a href="#trunkLayoutTestsimportedblinkhttptestsresourcestestharnessreportjs">trunk/LayoutTests/imported/blink/http/tests/resources/testharnessreport.js</a></li>
<li><a href="#trunkLayoutTestsresourcestestharnessreportjs">trunk/LayoutTests/resources/testharnessreport.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/ChangeLog 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-10-27 Chris Dumez <cdumez@apple.com>
+
+ Sync up all copies of testharnessreport.js
+ https://bugs.webkit.org/show_bug.cgi?id=164071
+
+ Reviewed by Youenn Fablet.
+
+ Sync up all copies of testharnessreport.js for consistency.
+
+ * http/tests/media/media-source/mediasource-play-then-seek-back-with-remote-control-expected.txt:
+ * http/tests/security/cross-origin-css-in-quirks-1-expected.txt:
+ * http/tests/security/cross-origin-css-in-quirks-2-expected.txt:
+ * http/tests/security/cross-origin-css-in-quirks-3-expected.txt:
+ * http/tests/security/cross-origin-css-in-quirks-4-expected.txt:
+ * http/tests/security/same-origin-css-1-expected.txt:
+ * http/tests/security/same-origin-css-2-expected.txt:
+ * http/tests/security/same-origin-css-3-expected.txt:
+ * http/tests/security/same-origin-css-in-quirks-expected.txt:
+ * http/tests/w3c/resources/testharnessreport.js:
+ (convertResult):
+ (self.testRunner.add_completion_callback.):
+ (self.testRunner.add_completion_callback):
+ (add_completion_callback.sanitize): Deleted.
+ (add_completion_callback): Deleted.
+ * imported/blink/http/tests/resources/testharnessreport.js:
+ (convertResult):
+ (self.testRunner.add_completion_callback.):
+ (self.testRunner.add_completion_callback):
+ (isCSSWGTest): Deleted.
+ (isJSTest): Deleted.
+ (add_completion_callback.sanitize): Deleted.
+ (add_completion_callback.done): Deleted.
+ (add_completion_callback): Deleted.
+ * resources/testharnessreport.js:
+ (self.testRunner.add_completion_callback.):
+ (self.testRunner.add_completion_callback):
+
</ins><span class="cx"> 2016-10-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Prevent hit tests from being performed on an invalid render tree
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediamediasourcemediasourceplaythenseekbackwithremotecontrolexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/media-source/mediasource-play-then-seek-back-with-remote-control-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/media-source/mediasource-play-then-seek-back-with-remote-control-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/media/media-source/mediasource-play-then-seek-back-with-remote-control-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><del>-
</del><ins>+
</ins><span class="cx"> PASS Test playing then seeking back with remote control command.(PASS if no crash)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossorigincss1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-origin-css-1-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-css-1-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/security/cross-origin-css-1-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> CONSOLE MESSAGE: Did not parse stylesheet at 'http://127.0.0.1:8000/resources/redirect.php?url=http://localhost:8000/security/resources/xorigincss1.html' because non CSS MIME types are not allowed in strict mode.
</span><span class="cx">
</span><span class="cx"> PASS Testing cross-origin and MIME behavior for CSS.
</span><del>-PASS xorigincss1.html should not be loaded via <link>.
</del><ins>+PASS xorigincss1.html should not be loaded via &lt;link&gt;.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossorigincss2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-origin-css-2-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-css-2-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/security/cross-origin-css-2-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> CONSOLE MESSAGE: Did not parse stylesheet at 'http://127.0.0.1:8000/resources/redirect.php?url=http://localhost:8000/security/resources/xorigincss2.html' because non CSS MIME types are not allowed in strict mode.
</span><span class="cx">
</span><span class="cx"> PASS Testing cross-origin and MIME behavior for CSS.
</span><del>-PASS xorigincss2.html should not be loaded either via <link> or @import.
</del><ins>+PASS xorigincss2.html should not be loaded either via &lt;link&gt; or @import.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossorigincss3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-origin-css-3-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-css-3-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/security/cross-origin-css-3-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx">
</span><span class="cx"> PASS Testing cross-origin and MIME behavior for CSS.
</span><del>-PASS xorigincss1.css should be loaded via <link>
</del><ins>+PASS xorigincss1.css should be loaded via &lt;link&gt;
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossorigincssinquirks1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-1-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-1-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-1-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> CONSOLE MESSAGE: Did not parse stylesheet at 'http://127.0.0.1:8000/resources/redirect.php?url=http://localhost:8000/security/resources/xorigincss1.html' because non CSS MIME types are not allowed for cross-origin stylesheets.
</span><span class="cx">
</span><span class="cx"> PASS Testing cross-origin and MIME behavior for CSS.
</span><del>-PASS xorigincss1.html should not be loaded via <link>.
</del><ins>+PASS xorigincss1.html should not be loaded via &lt;link&gt;.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossorigincssinquirks2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-2-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-2-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-2-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> CONSOLE MESSAGE: Did not parse stylesheet at 'http://127.0.0.1:8000/resources/redirect.php?url=http://localhost:8000/security/resources/xorigincss2.html' because non CSS MIME types are not allowed for cross-origin stylesheets.
</span><span class="cx">
</span><span class="cx"> PASS Testing cross-origin and MIME behavior for CSS.
</span><del>-PASS xorigincss2.html should not be loaded either via <link> or @import.
</del><ins>+PASS xorigincss2.html should not be loaded either via &lt;link&gt; or @import.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossorigincssinquirks3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-3-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-3-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-3-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx">
</span><span class="cx"> PASS Testing cross-origin and MIME behavior for CSS.
</span><del>-PASS xorigincss1.css should be loaded via <link>
</del><ins>+PASS xorigincss1.css should be loaded via &lt;link&gt;
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossorigincssinquirks4expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-4-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-4-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/security/cross-origin-css-in-quirks-4-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx">
</span><span class="cx"> PASS Testing cross-origin and MIME behavior for CSS.
</span><del>-PASS xorigincss3.html should be loaded via <link>
</del><ins>+PASS xorigincss3.html should be loaded via &lt;link&gt;
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritysameorigincss1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/same-origin-css-1-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/same-origin-css-1-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/security/same-origin-css-1-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> CONSOLE MESSAGE: Did not parse stylesheet at 'http://127.0.0.1:8000/resources/redirect.php?url=/security/resources/xorigincss1.html' because non CSS MIME types are not allowed in strict mode.
</span><span class="cx">
</span><span class="cx"> PASS Testing same-origin and MIME behavior for CSS.
</span><del>-PASS xorigincss1.html should not be loaded via <link>.
</del><ins>+PASS xorigincss1.html should not be loaded via &lt;link&gt;.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritysameorigincss2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/same-origin-css-2-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/same-origin-css-2-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/security/same-origin-css-2-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> CONSOLE MESSAGE: Did not parse stylesheet at 'http://127.0.0.1:8000/resources/redirect.php?url=/security/resources/xorigincss2.html' because non CSS MIME types are not allowed in strict mode.
</span><span class="cx">
</span><span class="cx"> PASS Testing same-origin and MIME behavior for CSS.
</span><del>-PASS xorigincss2.html should not be loaded either via <link> or @import.
</del><ins>+PASS xorigincss2.html should not be loaded either via &lt;link&gt; or @import.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritysameorigincss3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/same-origin-css-3-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/same-origin-css-3-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/security/same-origin-css-3-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx">
</span><span class="cx"> PASS Testing same-origin and MIME behavior for CSS.
</span><del>-PASS xorigincss1.css should be loaded via <link>
</del><ins>+PASS xorigincss1.css should be loaded via &lt;link&gt;
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritysameorigincssinquirksexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/same-origin-css-in-quirks-expected.txt (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/same-origin-css-in-quirks-expected.txt 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/security/same-origin-css-in-quirks-expected.txt 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> PASS background image loaded
</span><span class="cx">
</span><span class="cx"> PASS Testing same-origin and MIME behavior for CSS.
</span><del>-PASS xorigincss1.html should be loaded via <link>.
-PASS xorigincss2.html should be loaded either via <link> or @import.
-PASS xorigincss1.css should be loaded via <link>
</del><ins>+PASS xorigincss1.html should be loaded via &lt;link&gt;.
+PASS xorigincss2.html should be loaded either via &lt;link&gt; or @import.
+PASS xorigincss1.css should be loaded via &lt;link&gt;
</ins><span class="cx"> PASS xorigincss3.html should be loaded
</span><span class="cx"> PASS xorigincss4.html should be loaded via @import.
</span><span class="cx"> PASS xorigincss2.css should be loaded.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsw3cresourcestestharnessreportjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/w3c/resources/testharnessreport.js (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/w3c/resources/testharnessreport.js 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/http/tests/w3c/resources/testharnessreport.js 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -2,10 +2,9 @@
</span><span class="cx"> * This file is intended for vendors to implement
</span><span class="cx"> * code needed to integrate testharness.js tests with their own test systems.
</span><span class="cx"> *
</span><del>- * Typically test system integration will attach callbacks when each test has
- * run, using add_result_callback(callback(test)), or when the whole test file
- * has completed, using
- * add_completion_callback(callback(tests, harness_status)).
</del><ins>+ * Typically such integration will attach callbacks when each test is
+ * has run, using add_result_callback(callback(test)), or when the whole test file has
+ * completed, using add_completion_callback(callback(tests, harness_status)).
</ins><span class="cx"> *
</span><span class="cx"> * For more documentation about the callback functions and the
</span><span class="cx"> * parameters they are called with see testharness.js
</span><span class="lines">@@ -15,77 +14,80 @@
</span><span class="cx"> if (self.testRunner) {
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ testRunner.setCanOpenWindows();
+ // Let's restrict calling testharness timeout() to wptserve tests for the moment.
+ // That will limit the impact to a small number of tests.
+ // The risk is that testharness timeout() might be called to late on slow bots to finish properly.
+ if (testRunner.timeout && location.port == 8800)
+ setTimeout(timeout, testRunner.timeout * 0.9);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Function used to convert the test status code into
</span><span class="cx"> // the corresponding string
</span><del>-function convertResult(resultStatus){
- if(resultStatus == 0)
- return("PASS");
- else if(resultStatus == 1)
- return("FAIL");
- else if(resultStatus == 2)
- return("TIMEOUT");
- else
- return("NOTRUN");
</del><ins>+function convertResult(resultStatus)
+{
+ if(resultStatus == 0)
+ return("PASS");
+ else if(resultStatus == 1)
+ return("FAIL");
+ else if(resultStatus == 2)
+ return("TIMEOUT");
+ else
+ return("NOTRUN");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* Disable the default output of testharness.js. The default output formats
-* test results into an HTML table. When that table is dumped as text, no
-* spacing between cells is preserved, and it is therefore not readable. By
-* setting output to false, the HTML table will not be created
-*/
-setup({"output":false});
</del><ins>+if (self.testRunner) {
+ /* Disable the default output of testharness.js. The default output formats
+ * test results into an HTML table. When that table is dumped as text, no
+ * spacing between cells is preserved, and it is therefore not readable. By
+ * setting output to false, the HTML table will not be created
+ */
+ setup({"output": false, "explicit_timeout": true});
</ins><span class="cx">
</span><del>-/* Using a callback function, test results will be added to the page in a
-* manner that allows dumpAsText to produce readable test results
-*/
-add_completion_callback(function (tests, harness_status){
-
- // Create element to hold results
- var results = document.createElement("pre");
-
- // Declare result string
- var resultStr = "\n";
</del><ins>+ /* Using a callback function, test results will be added to the page in a
+ * manner that allows dumpAsText to produce readable test results
+ */
+ add_completion_callback(function (tests, harness_status) {
+ // Wait for any other completion callbacks
+ setTimeout(function() {
+ var results = document.createElement("pre");
+ var resultStr = "\n";
</ins><span class="cx">
</span><del>- // Sanitizes the given text for display in test results.
- function sanitize(text) {
- if (!text) {
- return "";
</del><ins>+ // Sanitizes the given text for display in test results.
+ function sanitize(text) {
+ if (!text) {
+ return "";
+ }
+ text = text.replace(/\0/g, "\\0");
+ return text.replace(/\r/g, "\\r");
</ins><span class="cx"> }
</span><del>- // Escape null characters, otherwise diff will think the file is binary.
- text = text.replace(/\0/g, "\\0");
- // Escape carriage returns as they break rietveld's difftools.
- return text.replace(/\r/g, "\\r");
- }
</del><span class="cx">
</span><del>-
- // Check harness_status. If it is not 0, tests did not
- // execute correctly, output the error code and message
- if(harness_status.status != 0){
- resultStr += "Harness Error. harness_status.status = " +
- harness_status.status +
- " , harness_status.message = " +
- harness_status.message;
- }
- else {
- // Iterate through tests array and build string that contains
- // results for all tests
- for(var i=0; i<tests.length; i++){
- resultStr += convertResult(tests[i].status) + " " +
- sanitize(tests[i].name) + " " +
- sanitize(tests[i].message) + "\n";
- }
- }
</del><ins>+ if(harness_status.status != 0)
+ resultStr += "Harness Error (" + convertResult(harness_status.status) + "), message = " + harness_status.message + "\n\n";
</ins><span class="cx">
</span><del>- // Set results element's innerHTML to the results string
- results.innerHTML = resultStr;
</del><ins>+ for (var i = 0; i < tests.length; i++) {
+ var message = sanitize(tests[i].message);
+ if (tests[i].status == 1 && !tests[i].dumpStack) {
+ // Remove stack for failed tests for proper string comparison without file paths.
+ // For a test to dump the stack set its dumpStack attribute to true.
+ var stackIndex = message.indexOf("(stack:");
+ if (stackIndex > 0)
+ message = message.substr(0, stackIndex);
+ }
+ resultStr += convertResult(tests[i].status) + " " + sanitize(tests[i].name) + " " + message + "\n";
+ }
</ins><span class="cx">
</span><del>- // Add results element to document
- document.body.appendChild(results);
</del><ins>+ results.innerText = resultStr;
+ var log = document.getElementById("log");
+ if (log)
+ log.appendChild(results);
+ else
+ document.body.appendChild(results);
</ins><span class="cx">
</span><del>- if (self.testRunner)
- testRunner.notifyDone();
-});
</del><ins>+ testRunner.notifyDone();
+ }, 0);
+ });
</ins><span class="cx">
</span><del>-// vim: set expandtab shiftwidth=4 tabstop=4:
</del><ins>+ if (window.internals)
+ window.internals.setResourceTimingSupport(true);
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedblinkhttptestsresourcestestharnessreportjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/blink/http/tests/resources/testharnessreport.js (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/blink/http/tests/resources/testharnessreport.js 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/imported/blink/http/tests/resources/testharnessreport.js 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,7 +1,5 @@
</span><span class="cx"> /*
</span><del>- * THIS FILE INTENTIONALLY LEFT BLANK
- *
- * More specifically, this file is intended for vendors to implement
</del><ins>+ * This file is intended for vendors to implement
</ins><span class="cx"> * code needed to integrate testharness.js tests with their own test systems.
</span><span class="cx"> *
</span><span class="cx"> * Typically such integration will attach callbacks when each test is
</span><span class="lines">@@ -17,12 +15,17 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx"> testRunner.setCanOpenWindows();
</span><del>- testRunner.setCloseRemainingWindowsWhenComplete(true);
</del><ins>+ // Let's restrict calling testharness timeout() to wptserve tests for the moment.
+ // That will limit the impact to a small number of tests.
+ // The risk is that testharness timeout() might be called to late on slow bots to finish properly.
+ if (testRunner.timeout && location.port == 8800)
+ setTimeout(timeout, testRunner.timeout * 0.9);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Function used to convert the test status code into
</span><span class="cx"> // the corresponding string
</span><del>-function convertResult(resultStatus) {
</del><ins>+function convertResult(resultStatus)
+{
</ins><span class="cx"> if(resultStatus == 0)
</span><span class="cx"> return("PASS");
</span><span class="cx"> else if(resultStatus == 1)
</span><span class="lines">@@ -33,99 +36,58 @@
</span><span class="cx"> return("NOTRUN");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Disable the default output of testharness.js. The default output formats
-* test results into an HTML table. When that table is dumped as text, no
-* spacing between cells is preserved, and it is therefore not readable. By
-* setting output to false, the HTML table will not be created
-*/
-setup({"output":false});
</del><ins>+if (self.testRunner) {
+ /* Disable the default output of testharness.js. The default output formats
+ * test results into an HTML table. When that table is dumped as text, no
+ * spacing between cells is preserved, and it is therefore not readable. By
+ * setting output to false, the HTML table will not be created
+ */
+ setup({"output": false, "explicit_timeout": true});
</ins><span class="cx">
</span><del>-/* If the test has a meta tag named flags and the content contains "dom", then it's a CSSWG test.
- */
-function isCSSWGTest() {
- var flags = document.querySelector('meta[name=flags]'),
- content = flags ? flags.getAttribute('content') : null;
</del><ins>+ /* Using a callback function, test results will be added to the page in a
+ * manner that allows dumpAsText to produce readable test results
+ */
+ add_completion_callback(function (tests, harness_status) {
+ // Wait for any other completion callbacks
+ setTimeout(function() {
+ var results = document.createElement("pre");
+ var resultStr = "\n";
</ins><span class="cx">
</span><del>- return content && content.match(/\bdom\b/);
-}
</del><ins>+ // Sanitizes the given text for display in test results.
+ function sanitize(text) {
+ if (!text) {
+ return "";
+ }
+ text = text.replace(/\0/g, "\\0");
+ return text.replace(/\r/g, "\\r");
+ }
</ins><span class="cx">
</span><del>-function isJSTest() {
- return !!document.querySelector('script[src*="/resources/testharness"]');
-}
</del><ins>+ if(harness_status.status != 0)
+ resultStr += "Harness Error (" + convertResult(harness_status.status) + "), message = " + harness_status.message + "\n\n";
</ins><span class="cx">
</span><del>-/* Using a callback function, test results will be added to the page in a
-* manner that allows dumpAsText to produce readable test results
-*/
-add_completion_callback(function (tests, harness_status) {
-
- // Create element to hold results
- var results = document.createElement("pre");
-
- // Declare result string
- var resultStr = "This is a testharness.js-based test.\n";
-
- // Sanitizes the given text for display in test results.
- function sanitize(text) {
- if (!text) {
- return "";
- }
- // Escape null characters, otherwise diff will think the file is binary.
- text = text.replace(/\0/g, "\\0");
- // Escape carriage returns as they break rietveld's difftools.
- return text.replace(/\r/g, "\\r");
- }
-
- // Check harness_status. If it is not 0, tests did not
- // execute correctly, output the error code and message
- if (harness_status.status != 0) {
- resultStr += "Harness Error. harness_status.status = " +
- harness_status.status +
- " , harness_status.message = " +
- harness_status.message +
- "\n";
- } else {
- // Iterate through tests array and build string that contains
- // results for all tests
- for (var i = 0; i < tests.length; i++) {
- resultStr += convertResult(tests[i].status) + " " +
- sanitize(tests[i].name) + " " +
- sanitize(tests[i].message) + "\n";
- }
- }
- resultStr += "Harness: the test ran to completion.\n";
-
- // Set results element's textContent to the results string
- results.textContent = resultStr;
-
- function done() {
- if (self.testRunner) {
- var logDiv = document.getElementById('log');
- if ((isCSSWGTest() || isJSTest()) && logDiv) {
- // Assume it's a CSSWG style test, and anything other than the log div isn't
- // material to the testrunner output, so should be hidden from the text dump
- var next = null;
- for (var child = document.body.firstChild; child; child = next) {
- next = child.nextSibling;
- if (child.nodeType == Node.ELEMENT_NODE)
- child.style.visibility = "hidden";
- else if (child.nodeType == Node.TEXT_NODE)
- document.body.removeChild(child);
</del><ins>+ for (var i = 0; i < tests.length; i++) {
+ var message = sanitize(tests[i].message);
+ if (tests[i].status == 1 && !tests[i].dumpStack) {
+ // Remove stack for failed tests for proper string comparison without file paths.
+ // For a test to dump the stack set its dumpStack attribute to true.
+ var stackIndex = message.indexOf("(stack:");
+ if (stackIndex > 0)
+ message = message.substr(0, stackIndex);
</ins><span class="cx"> }
</span><ins>+ resultStr += convertResult(tests[i].status) + " " + sanitize(tests[i].name) + " " + message + "\n";
</ins><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- // Add results element to document.
- if (!document.body)
- document.documentElement.appendChild(document.createElement("body"));
- document.body.appendChild(results);
</del><ins>+ results.innerText = resultStr;
+ var log = document.getElementById("log");
+ if (log)
+ log.appendChild(results);
+ else
+ document.body.appendChild(results);
</ins><span class="cx">
</span><del>- if (self.testRunner)
</del><span class="cx"> testRunner.notifyDone();
</span><del>- }
</del><ins>+ }, 0);
+ });
</ins><span class="cx">
</span><del>- if (document.readyState === 'loading') {
- window.addEventListener('load', done);
- } else {
- setTimeout(done, 0);
- }
-});
</del><ins>+ if (window.internals)
+ window.internals.setResourceTimingSupport(true);
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsresourcestestharnessreportjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/resources/testharnessreport.js (208003 => 208004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/resources/testharnessreport.js 2016-10-27 20:56:17 UTC (rev 208003)
+++ trunk/LayoutTests/resources/testharnessreport.js 2016-10-27 21:14:50 UTC (rev 208004)
</span><span class="lines">@@ -1,7 +1,5 @@
</span><span class="cx"> /*
</span><del>- * THIS FILE INTENTIONALLY LEFT BLANK
- *
- * More specifically, this file is intended for vendors to implement
</del><ins>+ * This file is intended for vendors to implement
</ins><span class="cx"> * code needed to integrate testharness.js tests with their own test systems.
</span><span class="cx"> *
</span><span class="cx"> * Typically such integration will attach callbacks when each test is
</span><span class="lines">@@ -60,9 +58,7 @@
</span><span class="cx"> if (!text) {
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><del>- // Escape null characters, otherwise diff will think the file is binary.
</del><span class="cx"> text = text.replace(/\0/g, "\\0");
</span><del>- // Escape carriage returns as they break rietveld's difftools.
</del><span class="cx"> return text.replace(/\r/g, "\\r");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>