diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js index 89912ebccd9828b68b2d2f3b3fd4f845384d4203..130c88ecf612aa4a04557250a6dee508413671f3 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js @@ -56,18 +56,18 @@ BuildbotTesterQueueView.prototype = { var limit = 2; for (var i = 0; i < queue.iterations.length && limit > 0; ++i) { var iteration = queue.iterations[i]; - if (!iteration.finished) + if (!iteration.loaded || !iteration.finished) continue; --limit; var messageLinkElement = this.revisionLinksForIteration(iteration); - var layoutTestResults = iteration.layoutTestResults; - var javascriptTestResults = iteration.javascriptTestResults; - var pythonTestResults = iteration.pythonTestResults; - var perlTestResults = iteration.perlTestResults; - var bindingTestResults = iteration.bindingTestResults; + var layoutTestResults = iteration.layoutTestResults || {}; + var javascriptTestResults = iteration.javascriptTestResults || {}; + var pythonTestResults = iteration.pythonTestResults || {}; + var perlTestResults = iteration.perlTestResults || {}; + var bindingTestResults = iteration.bindingTestResults || {}; if (!layoutTestResults.failureCount && !javascriptTestResults.failureCount && !pythonTestResults.failureCount && !perlTestResults.failureCount && !bindingTestResults.failureCount) { var status = new StatusLineView(messageLinkElement, StatusLineView.Status.Good, "all tests passed"); diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js index 09319a584a9a8640ddef7adea91799572eef6b95..05dd697224912534279c25da1939f62c13ebf87c 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js @@ -61,16 +61,16 @@ WebKitBuildbot.prototype = { buildLogURLForIteration: function(iteration) { - return this.baseURL + "/builders/" + encodeURIComponent(iteration.queue.id) + "/builds/" + iteration.id + "/steps/compile-webkit/logs/stdio/text"; + return this.baseURL + "builders/" + encodeURIComponent(iteration.queue.id) + "/builds/" + iteration.id + "/steps/compile-webkit/logs/stdio/text"; }, layoutTestResultsURLForIteration: function(iteration) { - return this.baseURL + "/results/" + encodeURIComponent(iteration.queue.id) + "/" + encodeURIComponent("r" + iteration.openSourceRevision + " (" + iteration.id + ")") + "/results.html"; + return this.baseURL + "results/" + encodeURIComponent(iteration.queue.id) + "/" + encodeURIComponent("r" + iteration.openSourceRevision + " (" + iteration.id + ")") + "/results.html"; }, javascriptTestResultsURLForIteration: function(iteration) { - return this.baseURL + "/builders/" + encodeURIComponent(iteration.queue.id) + "/builds/" + iteration.id + "/steps/jscore-test/logs/actual.html"; + return this.baseURL + "builders/" + encodeURIComponent(iteration.queue.id) + "/builds/" + iteration.id + "/steps/jscore-test/logs/actual.html"; } }; diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html index 98d81b4adfa77d92a1b933cc796608b853011e10..7223b74a40ade2aa0ded11bb778b1c02f8305151 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html @@ -25,6 +25,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + WebKit Buildbot Dashboard + diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 5dfabf204778e69649c9b77095177abe253d895a..1835a3d70d65694f40787f8ac07bf49da8d31708 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,21 @@ +2013-10-01 Timothy Hatcher + + Fix some exceptions seen in the Buildbot Dashboard when looking at unloaded iterations. + + Also fix some URLs to not have extras slashes and add a page title. + + https://bugs.webkit.org/show_bug.cgi?id=122192 + + Reviewed by Joseph Pecoraro. + + * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js: + (BuildbotTesterQueueView.prototype.update.appendBuilderQueueStatus): + * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js: + (WebKitBuildbot.prototype.buildLogURLForIteration): + (WebKitBuildbot.prototype.layoutTestResultsURLForIteration): + (WebKitBuildbot.prototype.javascriptTestResultsURLForIteration): + * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html: + 2013-10-01 Alexey Proskuryakov [Mac] Set NSApplication current event while sending events directly to views