[webkit-changes] [158136] trunk/Tools

Mon, 28 Oct 2013 15:00:48 -0700

Title: [158136] trunk/Tools
Revision
158136
Author
[email protected]
Date
2013-10-28 15:01:22 -0700 (Mon, 28 Oct 2013)

Log Message

Allow explicit sort order for Dashboard platforms
https://bugs.webkit.org/show_bug.cgi?id=123419

Reviewed by Tim Hatcher.

Assign a specific sort order to Dashboard platforms, rather than
just using object property order.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
(BuildbotQueue):
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
(documentReady):

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js (158135 => 158136)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js	2013-10-28 22:00:25 UTC (rev 158135)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js	2013-10-28 22:01:22 UTC (rev 158136)
@@ -41,15 +41,15 @@
 
 // Ordered importance/recency.
 Buildbot.Platform = {
-    MacOSXMavericks: "mac-os-x-mavericks",
-    MacOSXMountainLion: "mac-os-x-mountain-lion",
-    MacOSXLion: "mac-os-x-lion",
-    Windows8: "windows-8",
-    Windows7: "windows-7",
-    WindowsXP: "windows-xp",
-    LinuxQt: "linux-qt",
-    LinuxGTK: "linux-gtk",
-    LinuxEFL: "linux-efl",
+    MacOSXMavericks: { name: "mac-os-x-mavericks", order: 10 },
+    MacOSXMountainLion: { name: "mac-os-x-mountain-lion", order: 20 },
+    MacOSXLion: { name : "mac-os-x-lion", order: 30 },
+    Windows8: { name: "windows-8", order: 40 },
+    Windows7: { name: "windows-7", order: 50 },
+    WindowsXP: { name: "windows-xp", order: 60 },
+    LinuxQt: { name : "linux-qt", order: 70 },
+    LinuxGTK: { name : "linux-gtk", order: 80 },
+    LinuxEFL: { name: "linux-efl", order : 90 }
 };
 
 // Ordered importance.

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js (158135 => 158136)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js	2013-10-28 22:00:25 UTC (rev 158135)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js	2013-10-28 22:01:22 UTC (rev 158136)
@@ -33,7 +33,7 @@
     this.buildbot = buildbot;
     this.id = id;
 
-    this.platform = info.platform || "unknown";
+    this.platform = info.platform.name || "unknown";
     this.debug = info.debug || false;
     this.builder = info.builder || false;
     this.tester = info.tester || false;

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js (158135 => 158136)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js	2013-10-28 22:00:25 UTC (rev 158135)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js	2013-10-28 22:01:22 UTC (rev 158136)
@@ -60,6 +60,20 @@
 testNames[Buildbot.TestCategory.WebKit2] = "WK2 Tests";
 testNames[Buildbot.TestCategory.WebKit1] = "WK1 Tests";
 
+function sortedPlatforms()
+{
+    var platforms = [];
+
+    for (var platformKey in Buildbot.Platform)
+        platforms.push(Buildbot.Platform[platformKey]);
+
+    platforms.sort(function(a, b) {
+        return a.order - b.order;
+    });
+    
+    return platforms;
+}
+
 function documentReady()
 {
     var table = document.createElement("table");
@@ -84,14 +98,17 @@
 
     table.appendChild(row);
 
-    for (var platformKey in Buildbot.Platform) {
-        var platformQueues = categorizedQueuesByPlatformAndBuildType[Buildbot.Platform[platformKey]];
+    var platforms = sortedPlatforms();
+
+    for (var i in platforms) {
+        var platform = platforms[i];
+        var platformQueues = categorizedQueuesByPlatformAndBuildType[platform.name];
         if (!platformQueues)
             continue;
 
         var row = document.createElement("tr");
         row.classList.add("platform");
-        row.classList.add(Buildbot.Platform[platformKey]);
+        row.classList.add(platform.name);
 
         var cell = document.createElement("td");
         cell.classList.add("logo");

Modified: trunk/Tools/ChangeLog (158135 => 158136)


--- trunk/Tools/ChangeLog	2013-10-28 22:00:25 UTC (rev 158135)
+++ trunk/Tools/ChangeLog	2013-10-28 22:01:22 UTC (rev 158136)
@@ -1,5 +1,21 @@
 2013-10-28  Simon Fraser  <[email protected]>
 
+        Allow explicit sort order for Dashboard platforms
+        https://bugs.webkit.org/show_bug.cgi?id=123419
+
+        Reviewed by Tim Hatcher.
+        
+        Assign a specific sort order to Dashboard platforms, rather than
+        just using object property order.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
+        (BuildbotQueue):
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
+        (documentReady):
+
+2013-10-28  Simon Fraser  <[email protected]>
+
         Tidy up main http://build.webkit.org page
         https://bugs.webkit.org/show_bug.cgi?id=123413
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to