build.webkit.org/dashboard: Don't list test steps in BuildbotIteration twice

https://bugs.webkit.org/show_bug.cgi?id=145342

Reviewed by Darin Adler.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
(BuildbotIteration.prototype._parseData):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@184858 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js
index 718afabdb1d017086f8793f7729299b84d07a1f3..2b9cf0ad22bbb72c1d6069529001c5fb8095e861 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js
@@ -64,29 +64,26 @@ BuildbotIteration.EXCEPTION = 4;
 BuildbotIteration.RETRY = 5;
 
 // If none of these steps ran, then we didn't get any real results, and the iteration was not productive.
+// All test steps are considered productive too.
 BuildbotIteration.ProductiveSteps = {
-    "compile-webkit": 1,
-    "build ASan archive": 1,
     "Build" : 1,
-    "layout-test": 1,
-    "jscore-test": 1,
-    "run-api-tests": 1,
-    "API tests": 1,
-    "webkitpy-test": 1,
-    "webkitperl-test": 1,
-    "bindings-generation-tests": 1,
-    "perf-test": 1,
+    "build ASan archive": 1,
+    "compile-webkit": 1,
     "scan build": 1,
 };
 
+// These have a special meaning for test queue views.
 BuildbotIteration.TestSteps = {
-    "layout-test": "layout test",
+    "API tests": "platform api test",
+    "bindings-generation-tests": "bindings tests",
     "jscore-test": "javascript test",
+    "layout-test": "layout test",
+    "perf-test": "performance test",
     "run-api-tests": "api test",
-    "API tests": "platform api test",
-    "webkitpy-test": "webkitpy test",
+    "webkit-32bit-jsc-test": "javascript test",
+    "webkit-jsc-cloop-test": "javascript cloop test",
     "webkitperl-test": "webkitperl test",
-    "bindings-generation-tests": "bindings tests",
+    "webkitpy-test": "webkitpy test",
 };
 
 BuildbotIteration.Event = {
@@ -274,7 +271,7 @@ BuildbotIteration.prototype = {
                 var step = data.steps[i];
                 if (!step.isFinished)
                     break;
-                if (step.name in BuildbotIteration.ProductiveSteps) {
+                if (step.name in BuildbotIteration.ProductiveSteps || step.name in BuildbotIteration.TestSteps) {
                     finishedAnyProductiveStep = true;
                     break;
                 }

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 195fa1a512cea0fc5ce0ea973aaccc168b4aee7f..0df7f5ca22c23fd4ecf08645f3b9b216a83a4345 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2015-05-26  Alexey Proskuryakov  <ap@apple.com>
+
+        build.webkit.org/dashboard: Don't list test steps in BuildbotIteration twice
+        https://bugs.webkit.org/show_bug.cgi?id=145342
+
+        Reviewed by Darin Adler.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
+        (BuildbotIteration.prototype._parseData):
+
 2015-05-26  Milan Crha  <mcrha@redhat.com>
 
         [GTK] Expand wildcards inside generate-inspector-gresource-manifest.py