Add Chromium gpu_tests to the flakiness dashboard

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

Patch by Dave Tu <dtu@chromium.org> on 2012-02-23
Reviewed by Ojan Vafai.

* Tools/TestResultServer/static-dashboards/builders.js:
* Tools/TestResultServer/static-dashboards/dashboard_base.js:

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

diff --git a/ChangeLog b/ChangeLog
index c3377d8..6d78656 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-02-23  Dave Tu  <dtu@chromium.org>
+
+        Add Chromium gpu_tests to the flakiness dashboard
+        https://bugs.webkit.org/show_bug.cgi?id=79300
+
+        Reviewed by Ojan Vafai.
+
+        * Tools/TestResultServer/static-dashboards/builders.js:
+        * Tools/TestResultServer/static-dashboards/dashboard_base.js:
+
 2012-02-23  Patrick Gansterer  <paroga@webkit.org>
 
         [CMake] Add WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS macro

diff --git a/Tools/TestResultServer/static-dashboards/builders.js b/Tools/TestResultServer/static-dashboards/builders.js
index 939dbe5..e868382 100644 (file)
--- a/Tools/TestResultServer/static-dashboards/builders.js
+++ b/Tools/TestResultServer/static-dashboards/builders.js
@@ -42,10 +42,18 @@ BuilderMaster.prototype.getLogPath = function(builder, buildNumber)
 
 CHROMIUM_BUILDER_MASTER = new BuilderMaster('Chromium', 'http://build.chromium.org/p/chromium/builders/');
 CHROMIUMOS_BUILDER_MASTER = new BuilderMaster('ChromiumChromiumOS', 'http://build.chromium.org/p/chromium.chromiumos/builders/');
-CHROMIUM_WEBKIT_BUILDER_MASTER = new BuilderMaster('ChromiumWebkit', 'http://build.chromium.org/p/chromium.webkit/builders/');
 CHROMIUM_GPU_BUILDER_MASTER = new BuilderMaster('ChromiumGPU', 'http://build.chromium.org/p/chromium.gpu/builders/');
+CHROMIUM_WEBKIT_BUILDER_MASTER = new BuilderMaster('ChromiumWebkit', 'http://build.chromium.org/p/chromium.webkit/builders/');
 WEBKIT_BUILDER_MASTER = new BuilderMaster('webkit.org', 'http://build.webkit.org/builders/');
 
+var LEGACY_BUILDER_MASTERS_TO_GROUPS = {
+    'Chromium': '@DEPS - chromium.org',
+    'ChromiumChromiumOS': '@DEPS CrOS - chromium.org',
+    'ChromiumGPU': '@DEPS - chromium.org',
+    'ChromiumWebkit': '@ToT - chromium.org',
+    'webkit.org': '@ToT - webkit.org'
+};
+
 function BuilderGroup(isToTWebKit, builders)
 {
     this.isToTWebKit = isToTWebKit;
@@ -151,11 +159,27 @@ var LAYOUT_TESTS_BUILDER_GROUPS = {
     '@ToT GPU Mesa - chromium.org': new BuilderGroup(BuilderGroup.TOT_WEBKIT, CHROMIUM_GPU_MESA_BUILDERS)
 };
 
-var LEGACY_BUILDER_MASTERS_TO_GROUPS = {
-    'Chromium': '@DEPS - chromium.org',
-    'ChromiumChromiumOS': '@DEPS CrOS - chromium.org',
-    'ChromiumWebkit': '@ToT - chromium.org',
-    'webkit.org': '@ToT - webkit.org'
+var CHROMIUM_GPU_GTESTS_DEPS_BUILDERS = [
+    ['Win7 Release (ATI)', BuilderGroup.DEFAULT_BUILDER],
+    ['Win7 Release (Intel)'],
+    ['WinXP Release (NVIDIA)'],
+    ['WinXP Debug (NVIDIA)'],
+    ['Mac Release (Intel)'],
+    ['Linux Release (ATI)'],
+    ['Linux Release (Intel)'],
+];
+associateBuildersWithMaster(CHROMIUM_GPU_GTESTS_DEPS_BUILDERS, CHROMIUM_GPU_BUILDER_MASTER);
+
+var CHROMIUM_GPU_GTESTS_TOT_BUILDERS = [
+    ['GPU Win7 (dbg) (NVIDIA)', BuilderGroup.DEFAULT_BUILDER],
+    ['GPU Mac (dbg)'],
+    ['GPU Linux (dbg) (NVIDIA)'],
+];
+associateBuildersWithMaster(CHROMIUM_GPU_GTESTS_TOT_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
+
+var CHROMIUM_GPU_TESTS_BUILDER_GROUPS = {
+    '@DEPS - chromium.org': new BuilderGroup(BuilderGroup.DEPS_WEBKIT, CHROMIUM_GPU_GTESTS_DEPS_BUILDERS),
+    '@ToT - chromium.org': new BuilderGroup(BuilderGroup.TOT_WEBKIT, CHROMIUM_GPU_GTESTS_TOT_BUILDERS)
 };
 
 var CHROMIUM_GTESTS_DEPS_BUILDERS = [
@@ -219,7 +243,7 @@ var CHROMIUMOS_GTESTS_DEPS_BUILDERS = [
 ];
 associateBuildersWithMaster(CHROMIUMOS_GTESTS_DEPS_BUILDERS, CHROMIUMOS_BUILDER_MASTER);
 
- var CHROMIUM_GTESTS_TOT_BUILDERS = [
+var CHROMIUM_GTESTS_TOT_BUILDERS = [
     ['Win (dbg)', BuilderGroup.DEFAULT_BUILDER],
     ['Mac10.6 Tests'],
     ['Linux Tests'],

diff --git a/Tools/TestResultServer/static-dashboards/dashboard_base.js b/Tools/TestResultServer/static-dashboards/dashboard_base.js
index 7adb108..042ae10 100644 (file)
--- a/Tools/TestResultServer/static-dashboards/dashboard_base.js
+++ b/Tools/TestResultServer/static-dashboards/dashboard_base.js
@@ -123,6 +123,7 @@ var TEST_TYPES = [
     'crypto_unittests',
     'googleurl_unittests',
     'gfx_unittests',
+    'gpu_tests',
     'gpu_unittests',
     'installer_util_unittests',
     'interactive_ui_tests',
@@ -179,6 +180,7 @@ function handleValidHashParameterWrapper(key, value)
         validateParameter(g_currentState, key, value,
             function() {
               return value in LAYOUT_TESTS_BUILDER_GROUPS ||
+                  value in CHROMIUM_GPU_TESTS_BUILDER_GROUPS ||
                   value in CHROMIUM_GTESTS_BUILDER_GROUPS;
             });
         return true;
@@ -420,12 +422,14 @@ function isLayoutTestResults()
     return g_currentState.testType == 'layout-tests';
 }
 
-function currentBuilderGroup(opt_state)
+function currentBuilderGroupCategory(opt_state)
 {
     var state = opt_state || g_currentState;
     switch (state.testType) {
     case 'layout-tests':
-        return LAYOUT_TESTS_BUILDER_GROUPS[state.group]
+        return LAYOUT_TESTS_BUILDER_GROUPS
+    case 'gpu_tests':
+        return CHROMIUM_GPU_TESTS_BUILDER_GROUPS
     case 'aura_unittests':
     case 'aura_shell_unittests':
     case 'base_unittests':
@@ -456,12 +460,18 @@ function currentBuilderGroup(opt_state)
     case 'ui_tests':
     case 'unit_tests':
     case 'views_unittests':
-        return CHROMIUM_GTESTS_BUILDER_GROUPS[state.group];
+        return CHROMIUM_GTESTS_BUILDER_GROUPS
     default:
         console.log('invalid testType parameter: ' + state.testType);
     }
 }
 
+function currentBuilderGroup(opt_state)
+{
+    var state = opt_state || g_currentState;
+    return currentBuilderGroupCategory(state)[state.group]
+}
+
 function builderMaster(builderName)
 {
     return BUILDER_TO_MASTER[builderName];
@@ -889,7 +899,7 @@ function htmlForTestTypeSwitcher(opt_noBuilderMenu, opt_extraHtml, opt_includeNo
     }
 
     html += selectHTML('Group', 'group',
-        Object.keys(isLayoutTestResults() ? LAYOUT_TESTS_BUILDER_GROUPS : CHROMIUM_GTESTS_BUILDER_GROUPS));
+        Object.keys(currentBuilderGroupCategory()));
 
     if (!isTreeMap())
         html += checkboxHTML('showAllRuns', 'Show all runs', g_currentState.showAllRuns);