Modified: trunk/Tools/TestResultServer/static-dashboards/builders.js (101734 => 101735)
--- trunk/Tools/TestResultServer/static-dashboards/builders.js 2011-12-02 02:59:24 UTC (rev 101734)
+++ trunk/Tools/TestResultServer/static-dashboards/builders.js 2011-12-02 03:31:20 UTC (rev 101735)
@@ -89,15 +89,15 @@
});
}
-var CHROMIUM_DEPS_BUILDERS = [
+var CHROMIUM_LAYOUT_DEPS_BUILDERS = [
['Webkit Win (deps)', BuilderGroup.DEFAULT_BUILDER],
['Webkit Linux (deps)', BuilderGroup.EXPECTATIONS_BUILDER],
['Webkit Mac10.6 (deps)'],
['Webkit Mac10.6 (CG)(deps)'],
];
-associateBuildersWithMaster(CHROMIUM_DEPS_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
+associateBuildersWithMaster(CHROMIUM_LAYOUT_DEPS_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
-var CHROMIUM_TOT_BUILDERS = [
+var CHROMIUM_LAYOUT_TOT_BUILDERS = [
['Webkit Win', BuilderGroup.DEFAULT_BUILDER],
['Webkit Vista'],
['Webkit Win7'],
@@ -117,7 +117,7 @@
['Webkit Mac10.6 (CG)'],
['Webkit Mac10.6 (CG)(dbg)']
];
-associateBuildersWithMaster(CHROMIUM_TOT_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
+associateBuildersWithMaster(CHROMIUM_LAYOUT_TOT_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
var WEBKIT_TOT_BUILDERS = [
['Chromium Win Release (Tests)', BuilderGroup.DEFAULT_BUILDER],
@@ -155,8 +155,8 @@
associateBuildersWithMaster(CHROMIUM_GPU_MESA_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
var LAYOUT_TESTS_BUILDER_GROUPS = {
- '@DEPS - chromium.org': new BuilderGroup(BuilderGroup.DEPS_WEBKIT, CHROMIUM_DEPS_BUILDERS),
- '@ToT - chromium.org': new BuilderGroup(BuilderGroup.TOT_WEBKIT, CHROMIUM_TOT_BUILDERS),
+ '@DEPS - chromium.org': new BuilderGroup(BuilderGroup.DEPS_WEBKIT, CHROMIUM_LAYOUT_DEPS_BUILDERS),
+ '@ToT - chromium.org': new BuilderGroup(BuilderGroup.TOT_WEBKIT, CHROMIUM_LAYOUT_TOT_BUILDERS),
'@ToT - webkit.org': new BuilderGroup(BuilderGroup.TOT_WEBKIT, WEBKIT_TOT_BUILDERS),
'@ToT GPU Mesa - chromium.org': new BuilderGroup(BuilderGroup.TOT_WEBKIT, CHROMIUM_GPU_MESA_BUILDERS)
};
@@ -167,7 +167,7 @@
'webkit.org': '@ToT - webkit.org'
};
-var G_TESTS_BUILDERS = [
+var CHROMIUM_GTESTS_DEPS_BUILDERS = [
['Win', BuilderGroup.DEFAULT_BUILDER],
['Mac'],
['Linux'],
@@ -218,6 +218,17 @@
['Linux Tests (dbg)(shared)'],
['Linux Tests (Aura dbg)'],
];
-associateBuildersWithMaster(G_TESTS_BUILDERS, CHROMIUM_BUILDER_MASTER);
+associateBuildersWithMaster(CHROMIUM_GTESTS_DEPS_BUILDERS, CHROMIUM_BUILDER_MASTER);
-var G_TESTS_BUILDER_GROUP = new BuilderGroup(BuilderGroup.DEPS_WEBKIT, G_TESTS_BUILDERS);
+var CHROMIUM_GTESTS_TOT_BUILDERS = [
+ ['Win (dbg)', BuilderGroup.DEFAULT_BUILDER],
+ ['Mac10.6 Tests'],
+ ['Linux Tests'],
+];
+associateBuildersWithMaster(CHROMIUM_GTESTS_TOT_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
+
+var CHROMIUM_GTESTS_BUILDER_GROUPS = {
+ '@DEPS - chromium.org': new BuilderGroup(BuilderGroup.DEPS_WEBKIT, CHROMIUM_GTESTS_DEPS_BUILDERS),
+ '@ToT - chromium.org': new BuilderGroup(BuilderGroup.TOT_WEBKIT, CHROMIUM_GTESTS_TOT_BUILDERS),
+};
+
Modified: trunk/Tools/TestResultServer/static-dashboards/dashboard_base.js (101734 => 101735)
--- trunk/Tools/TestResultServer/static-dashboards/dashboard_base.js 2011-12-02 02:59:24 UTC (rev 101734)
+++ trunk/Tools/TestResultServer/static-dashboards/dashboard_base.js 2011-12-02 03:31:20 UTC (rev 101735)
@@ -454,7 +454,7 @@
case 'ui_tests':
case 'unit_tests':
case 'views_unittests':
- return G_TESTS_BUILDER_GROUP;
+ return CHROMIUM_GTESTS_BUILDER_GROUPS[state.group];
default:
console.log('invalid testType parameter: ' + state.testType);
}
@@ -886,8 +886,8 @@
html += selectHTML('Builder', 'builder', buildersForMenu);
}
- if (isLayoutTestResults())
- html += selectHTML('Group', 'group', Object.keys(LAYOUT_TESTS_BUILDER_GROUPS));
+ html += selectHTML('Group', 'group',
+ Object.keys(isLayoutTestResults() ? LAYOUT_TESTS_BUILDER_GROUPS : CHROMIUM_GTESTS_BUILDER_GROUPS));
if (!isTreeMap())
html += checkboxHTML('showAllRuns', 'Show all runs', g_currentState.showAllRuns);
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_tests.js (101734 => 101735)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_tests.js 2011-12-02 02:59:24 UTC (rev 101734)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_tests.js 2011-12-02 03:31:20 UTC (rev 101735)
@@ -384,6 +384,26 @@
assertEquals(container.querySelectorAll('input').length, 5);
}
+function testHtmlForTestTypeSwitcherGroup()
+{
+ var container = document.createElement('div');
+ g_currentState.testType = 'ui_tests';
+ container.innerHTML = htmlForTestTypeSwitcher();
+ var selects = container.querySelectorAll('select');
+ assertEquals(selects.length, 3);
+ var group = selects[2];
+ assertEquals(group.parentNode.textContent.indexOf('Group:'), 0);
+ assertEquals(group.children.length, 2);
+
+ g_currentState.testType = 'layout-tests';
+ container.innerHTML = htmlForTestTypeSwitcher();
+ var selects = container.querySelectorAll('select');
+ assertEquals(selects.length, 3);
+ var group = selects[2];
+ assertEquals(group.parentNode.textContent.indexOf('Group:'), 0);
+ assertEquals(group.children.length, 4);
+}
+
function runTests()
{
document.body.innerHTML = '<pre id=unittest-results></pre>';
