From c71fce9e05bbbe059d497fe390a421b84e7ed99d Mon Sep 17 00:00:00 2001 From: "ap@apple.com" Date: Thu, 19 Nov 2015 17:42:19 +0000 Subject: [PATCH] build.webkit.org/dashboard: Move layoutTestResultsDirectoryURLForIteration implementation to base class https://bugs.webkit.org/show_bug.cgi?id=151425 Reviewed by Tim Horton. * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js: (Buildbot.prototype.layoutTestResultsDirectoryURLForIteration): * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js: (WebKitBuildbot.prototype.layoutTestResultsDirectoryURLForIteration): Deleted. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192630 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- .../public_html/dashboard/Scripts/Buildbot.js | 13 +++++++++++++ .../public_html/dashboard/Scripts/WebKitBuildbot.js | 5 ----- Tools/ChangeLog | 12 ++++++++++++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js index 2fa79b7..08de9c8 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js @@ -151,6 +151,19 @@ Buildbot.prototype = { return this.baseURL + "builders/" + encodeURIComponent(iteration.queue.id) + "/builds/" + iteration.id; }, + layoutTestResultsDirectoryURLForIteration: function(iteration) + { + var underscoreSeparatedRevisions = "r"; + sortDictionariesByOrder(Dashboard.Repository).forEach(function(repository) { + if (iteration.revision[repository.name]) { + if (underscoreSeparatedRevisions.length > 1) + underscoreSeparatedRevisions += "_"; + underscoreSeparatedRevisions += iteration.revision[repository.name]; + } + }); + return this.baseURL + "results/" + encodeURIComponent(iteration.queue.id) + "/" + encodeURIComponent(underscoreSeparatedRevisions + " (" + iteration.id + ")"); + }, + layoutTestResultsURLForIteration: function(iteration) { return this.layoutTestResultsDirectoryURLForIteration(iteration) + "/results.html"; 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 ecf9d5b..bc5cbe6 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 @@ -97,10 +97,5 @@ WebKitBuildbot.prototype = { get defaultBranches() { return [{ repository: Dashboard.Repository.OpenSource, name: "trunk" }]; - }, - - layoutTestResultsDirectoryURLForIteration: function(iteration) - { - return this.baseURL + "results/" + encodeURIComponent(iteration.queue.id) + "/" + encodeURIComponent("r" + iteration.revision[Dashboard.Repository.OpenSource.name] + " (" + iteration.id + ")"); } }; diff --git a/Tools/ChangeLog b/Tools/ChangeLog index bd09ba6..24ce3b0 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2015-11-19 Alexey Proskuryakov + + build.webkit.org/dashboard: Move layoutTestResultsDirectoryURLForIteration implementation to base class + https://bugs.webkit.org/show_bug.cgi?id=151425 + + Reviewed by Tim Horton. + + * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js: + (Buildbot.prototype.layoutTestResultsDirectoryURLForIteration): + * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js: + (WebKitBuildbot.prototype.layoutTestResultsDirectoryURLForIteration): Deleted. + 2015-11-19 Youenn Fablet WPT server should use its own testharness.js file and generate a warning when it does not match WebKit version -- 1.8.3.1