<!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>[162236] 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/162236">162236</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-01-17 18:08:49 -0800 (Fri, 17 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>build.webkit.org/dashboard should have diff links in test results popovers
https://bugs.webkit.org/show_bug.cgi?id=126986
Reviewed by Tim Horton.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
(Buildbot.prototype.layoutTestCrashLogURLForIteration):
(Buildbot.prototype.layoutTestStderrURLForIteration):
(Buildbot.prototype.layoutTestDiffURLForIteration):
(Buildbot.prototype.layoutTestPrettyDiffURLForIteration):
* 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):</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 (162235 => 162236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2014-01-18 01:58:16 UTC (rev 162235)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2014-01-18 02:08:49 UTC (rev 162236)
</span><span class="lines">@@ -103,13 +103,26 @@
</span><span class="cx">
</span><span class="cx"> layoutTestCrashLogURLForIteration: function(iteration, testPath)
</span><span class="cx"> {
</span><del>- var crashLogPath = testPath.replace(/^(.*)\.(?:.*)$/, "$1-crash-log.txt");
- return this.layoutTestResultsDirectoryURLForIteration(iteration) + "/" + crashLogPath;
</del><ins>+ var path = testPath.replace(/^(.*)\.(?:.*)$/, "$1-crash-log.txt");
+ return this.layoutTestResultsDirectoryURLForIteration(iteration) + "/" + path;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> layoutTestStderrURLForIteration: function(iteration, testPath)
</span><span class="cx"> {
</span><del>- var crashLogPath = testPath.replace(/^(.*)\.(?:.*)$/, "$1-stderr.txt");
- return this.layoutTestResultsDirectoryURLForIteration(iteration) + "/" + crashLogPath;
</del><ins>+ var path = testPath.replace(/^(.*)\.(?:.*)$/, "$1-stderr.txt");
+ return this.layoutTestResultsDirectoryURLForIteration(iteration) + "/" + path;
+ },
+
+ layoutTestDiffURLForIteration: function(iteration, testPath)
+ {
+ var path = testPath.replace(/^(.*)\.(?:.*)$/, "$1-diff.txt");
+ return this.layoutTestResultsDirectoryURLForIteration(iteration) + "/" + path;
+ },
+
+ layoutTestPrettyDiffURLForIteration: function(iteration, testPath)
+ {
+ // pretty-patch may not be available, caller should check JSON results for has_pretty_patch attribute.
+ var path = testPath.replace(/^(.*)\.(?:.*)$/, "$1-pretty-diff.html");
+ return this.layoutTestResultsDirectoryURLForIteration(iteration) + "/" + path;
</ins><span class="cx"> }
</span><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 (162235 => 162236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-01-18 01:58:16 UTC (rev 162235)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-01-18 02:08:49 UTC (rev 162236)
</span><span class="lines">@@ -274,12 +274,22 @@
</span><span class="cx">
</span><span class="cx"> if (predicate(value)) {
</span><span class="cx"> var item = {path: key};
</span><ins>+
+ // FIXME (bug 127186): Crash log URL will be incorrect if crash only happened on retry (e.g. "TEXT CRASH").
+ // It should point to retries subdirectory, but the information about which attempt failed gets lost here.
</ins><span class="cx"> if (value.actual.contains("CRASH"))
</span><span class="cx"> item.crash = true;
</span><span class="cx"> if (value.actual.contains("TIMEOUT"))
</span><span class="cx"> item.timeout = true;
</span><ins>+
+ // FIXME (bug 127186): Similarly, we don't have a good way to present results for something like "TIMEOUT TEXT",
+ // not even UI wise. For now, only show a diff link if the first attempt has the diff.
+ if (value.actual.split(" ")[0].contains("TEXT"))
+ item.has_diff = true;
+
</ins><span class="cx"> if (value.has_stderr)
</span><span class="cx"> item.has_stderr = true;
</span><ins>+
</ins><span class="cx"> result.push(item);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -301,6 +311,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ this.hasPrettyPatch = data.has_pretty_patch;
+
</ins><span class="cx"> this.layoutTestResults.regressions = collectResults(data.tests, function(info) { return info["report"] === "REGRESSION" });
</span><span class="cx"> console.assert(data.num_regressions === this.layoutTestResults.regressions.length);
</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 (162235 => 162236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js 2014-01-18 01:58:16 UTC (rev 162235)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js 2014-01-18 02:08:49 UTC (rev 162236)
</span><span class="lines">@@ -179,6 +179,24 @@
</span><span class="cx"> rowElement.appendChild(failureKindElement);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (test.has_diff) {
+ 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);
+
+ 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);
+ }
+ }
+
</ins><span class="cx"> if (test.has_stderr) {
</span><span class="cx"> var stderrElement = document.createElement("a");
</span><span class="cx"> stderrElement.className = "additional-link"
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162235 => 162236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-18 01:58:16 UTC (rev 162235)
+++ trunk/Tools/ChangeLog 2014-01-18 02:08:49 UTC (rev 162236)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-17 Alexey Proskuryakov <ap@apple.com>
+
+ build.webkit.org/dashboard should have diff links in test results popovers
+ https://bugs.webkit.org/show_bug.cgi?id=126986
+
+ Reviewed by Tim Horton.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
+ (Buildbot.prototype.layoutTestCrashLogURLForIteration):
+ (Buildbot.prototype.layoutTestStderrURLForIteration):
+ (Buildbot.prototype.layoutTestDiffURLForIteration):
+ (Buildbot.prototype.layoutTestPrettyDiffURLForIteration):
+ * 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):
+
</ins><span class="cx"> 2014-01-17 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the bare minimum support for branches to the bot-watchers dashboard
</span></span></pre>
</div>
</div>
</body>
</html>