<!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>[162263] trunk/Tools</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/162263">162263</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-01-18 10:57:59 -0800 (Sat, 18 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>build.webkit.org/dashboard should have image diff links in test results popovers
https://bugs.webkit.org/show_bug.cgi?id=127188
Reviewed by Timothy Hatcher.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
(Buildbot.prototype.layoutTestImagesURLForIteration):
(Buildbot.prototype.layoutTestImageDiffURLForIteration):
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
(BuildbotIteration.prototype.loadLayoutTestResults):
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js:
(BuildbotTesterQueueView.prototype._popoverContentForLayoutTestRegressions.addFailureInfoLink):
(BuildbotTesterQueueView.prototype._popoverContentForLayoutTestRegressions.addFailureInfoText):
(BuildbotTesterQueueView.prototype._popoverContentForLayoutTestRegressions):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotTesterQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js (162262 => 162263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2014-01-18 18:50:42 UTC (rev 162262)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2014-01-18 18:57:59 UTC (rev 162263)
</span><span class="lines">@@ -124,5 +124,17 @@
</span><span class="cx"> // pretty-patch may not be available, caller should check JSON results for has_pretty_patch attribute.
</span><span class="cx"> var path = testPath.replace(/^(.*)\.(?:.*)$/, "$1-pretty-diff.html");
</span><span class="cx"> return this.layoutTestResultsDirectoryURLForIteration(iteration) + "/" + path;
</span><del>- }
</del><ins>+ },
+
+ layoutTestImagesURLForIteration: function(iteration, testPath)
+ {
+ var path = testPath.replace(/^(.*)\.(?:.*)$/, "$1-diffs.html");
+ return this.layoutTestResultsDirectoryURLForIteration(iteration) + "/" + path;
+ },
+
+ layoutTestImageDiffURLForIteration: function(iteration, testPath)
+ {
+ var path = testPath.replace(/^(.*)\.(?:.*)$/, "$1-diff.png");
+ return this.layoutTestResultsDirectoryURLForIteration(iteration) + "/" + path;
+ },
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (162262 => 162263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-01-18 18:50:42 UTC (rev 162262)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-01-18 18:57:59 UTC (rev 162263)
</span><span class="lines">@@ -287,6 +287,12 @@
</span><span class="cx"> if (value.actual.split(" ")[0].contains("TEXT"))
</span><span class="cx"> item.has_diff = true;
</span><span class="cx">
</span><ins>+ // FIXME (bug 127186): It is particularly unfortunate for image diffs, because we currently only check image results
+ // on retry (except for reftests), so many times, you will see images on buidbot page, but not on the dashboard.
+ // FIXME: Find a way to display expected mismatch reftest failures.
+ if (value.actual.split(" ")[0].contains("IMAGE") && value.reftest_type != "!=")
+ item.has_image_diff = true;
+
</ins><span class="cx"> if (value.has_stderr)
</span><span class="cx"> item.has_stderr = true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotTesterQueueViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js (162262 => 162263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js 2014-01-18 18:50:42 UTC (rev 162262)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js 2014-01-18 18:57:59 UTC (rev 162263)
</span><span class="lines">@@ -151,6 +151,24 @@
</span><span class="cx"> return content;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function addFailureInfoLink(rowElement, className, text, url)
+ {
+ var linkElement = document.createElement("a");
+ linkElement.className = className;
+ linkElement.textContent = text;
+ linkElement.href = url;
+ linkElement.target = "_blank";
+ rowElement.appendChild(linkElement);
+ }
+
+ function addFailureInfoText(rowElement, className, text)
+ {
+ var spanElement = document.createElement("span");
+ spanElement.className = className;
+ spanElement.textContent = text;
+ rowElement.appendChild(spanElement);
+ }
+
</ins><span class="cx"> var sortedRegressions = iteration.layoutTestResults.regressions.slice().sort(function(a, b) { return (a.path === b.path) ? 0 : (a.path > b.path) ? 1 : -1; });
</span><span class="cx">
</span><span class="cx"> for (var i = 0, end = sortedRegressions.length; i != end; ++i) {
</span><span class="lines">@@ -163,58 +181,30 @@
</span><span class="cx"> testPathElement.textContent = test.path;
</span><span class="cx"> rowElement.appendChild(testPathElement);
</span><span class="cx">
</span><del>- if (test.crash) {
- var failureKindElement = document.createElement("a");
- failureKindElement.className = "failure-kind-indicator"
- failureKindElement.textContent = "crash";
- failureKindElement.href = iteration.queue.buildbot.layoutTestCrashLogURLForIteration(iteration, test.path);
- failureKindElement.target = "_blank";
- rowElement.appendChild(failureKindElement);
- }
</del><ins>+ if (test.crash)
+ addFailureInfoLink(rowElement, "failure-kind-indicator", "crash", iteration.queue.buildbot.layoutTestCrashLogURLForIteration(iteration, test.path));
</ins><span class="cx">
</span><del>- if (test.timeout) {
- var failureKindElement = document.createElement("span");
- failureKindElement.className = "failure-kind-indicator"
- failureKindElement.textContent = "timeout";
- rowElement.appendChild(failureKindElement);
- }
</del><ins>+ if (test.timeout)
+ addFailureInfoText(rowElement, "failure-kind-indicator", "timeout");
</ins><span class="cx">
</span><span class="cx"> if (test.has_diff) {
</span><del>- var diffElement = document.createElement("a");
- diffElement.className = "additional-link"
- diffElement.textContent = "diff";
- diffElement.href = iteration.queue.buildbot.layoutTestDiffURLForIteration(iteration, test.path);
- diffElement.target = "_blank";
- rowElement.appendChild(diffElement);
</del><ins>+ addFailureInfoLink(rowElement, "additional-link", "diff", iteration.queue.buildbot.layoutTestDiffURLForIteration(iteration, test.path));
</ins><span class="cx">
</span><del>- if (iteration.hasPrettyPatch) {
- var prettyDiffElement = document.createElement("a");
- prettyDiffElement.className = "additional-link"
- prettyDiffElement.textContent = "pretty\xa0diff";
- prettyDiffElement.href = iteration.queue.buildbot.layoutTestPrettyDiffURLForIteration(iteration, test.path);
- prettyDiffElement.target = "_blank";
- rowElement.appendChild(prettyDiffElement);
- }
</del><ins>+ if (iteration.hasPrettyPatch)
+ addFailureInfoLink(rowElement, "additional-link", "pretty\xa0diff", iteration.queue.buildbot.layoutTestPrettyDiffURLForIteration(iteration, test.path));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (test.has_stderr) {
- var stderrElement = document.createElement("a");
- stderrElement.className = "additional-link"
- stderrElement.textContent = "stderr";
- stderrElement.href = iteration.queue.buildbot.layoutTestStderrURLForIteration(iteration, test.path);
- stderrElement.target = "_blank";
- rowElement.appendChild(stderrElement);
</del><ins>+ if (test.has_image_diff) {
+ addFailureInfoLink(rowElement, "additional-link", "images", iteration.queue.buildbot.layoutTestImagesURLForIteration(iteration, test.path));
+ addFailureInfoLink(rowElement, "additional-link", "image\xa0diff", iteration.queue.buildbot.layoutTestImageDiffURLForIteration(iteration, test.path));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (hasTestHistory) {
- var testHistoryLink = document.createElement("a");
- testHistoryLink.className = "test-history-link";
- testHistoryLink.textContent = "history";
- testHistoryLink.href = testHistory.historyPageURLForTest(test.path);
- testHistoryLink.target = "_blank";
- rowElement.appendChild(testHistoryLink);
- }
</del><ins>+ if (test.has_stderr)
+ addFailureInfoLink(rowElement, "additional-link", "stderr", iteration.queue.buildbot.layoutTestStderrURLForIteration(iteration, test.path));
</ins><span class="cx">
</span><ins>+ if (hasTestHistory)
+ addFailureInfoLink(rowElement, "test-history-link", "history", testHistory.historyPageURLForTest(test.path));
+
</ins><span class="cx"> content.appendChild(rowElement);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162262 => 162263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-18 18:50:42 UTC (rev 162262)
+++ trunk/Tools/ChangeLog 2014-01-18 18:57:59 UTC (rev 162263)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-18 Alexey Proskuryakov <ap@apple.com>
+
+ build.webkit.org/dashboard should have image diff links in test results popovers
+ https://bugs.webkit.org/show_bug.cgi?id=127188
+
+ Reviewed by Timothy Hatcher.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
+ (Buildbot.prototype.layoutTestImagesURLForIteration):
+ (Buildbot.prototype.layoutTestImageDiffURLForIteration):
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
+ (BuildbotIteration.prototype.loadLayoutTestResults):
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js:
+ (BuildbotTesterQueueView.prototype._popoverContentForLayoutTestRegressions.addFailureInfoLink):
+ (BuildbotTesterQueueView.prototype._popoverContentForLayoutTestRegressions.addFailureInfoText):
+ (BuildbotTesterQueueView.prototype._popoverContentForLayoutTestRegressions):
+
</ins><span class="cx"> 2014-01-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE_THREADED_HTML_PARSER defines everywhere
</span></span></pre>
</div>
</div>
</body>
</html>