Commit 2aa6452a authored by ojan@chromium.org's avatar ojan@chromium.org

Allow both the ChromiumLinux and chromium.linux formats for the master parameter.

Also, fix the styling of FAIL failure types now that gtests use that
instead of having FAIL masquerade as TEXT.

BUG=395496
R=pdr@chromium.org

Review URL: https://codereview.chromium.org/409523002

git-svn-id: svn://svn.chromium.org/blink/trunk@178538 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 9197d2e2
......@@ -29,11 +29,13 @@
function LOAD_BUILDBOT_DATA(builderData)
{
builders.masters = {};
builders.urlNameToMasterName = {};
var groups = {};
var testTypes = {};
var testTypesThatDoNotUpload = {};
builders.noUploadTestTypes = builderData['no_upload_test_types']
builderData['masters'].forEach(function(master) {
builders.urlNameToMasterName[master.url_name] = master.name;
builders.masters[master.name] = new builders.BuilderMaster(master);
master.groups.forEach(function(group) { groups[group] = true; });
......
......@@ -129,7 +129,7 @@
.IMAGE {
background-color: #69f;
}
.TEXT {
.FAIL, .TEXT {
background-color: #e98080;
}
.MISSING {
......
......@@ -71,21 +71,21 @@ history.queryHashAsMap = function()
paramsMap[thisParam[0]] = decodeURIComponent(thisParam[1]);
}
// FIXME: remove support for mapping from the master parameter to the group
// one once the waterfall starts to pass in the builder name instead.
// FIXME: Make master a first-class parameter instead of replacing it with the group.
if (paramsMap.master) {
var errors = new ui.Errors();
if (paramsMap.master == 'TryServer')
errors.addError('ERROR: You got here from the trybot waterfall. The try bots do not record data in the flakiness dashboard. Showing results for the regular waterfall.');
else if (!builders.masters[paramsMap.master])
else if (!builders.masters[paramsMap.master] && !builders.urlNameToMasterName[paramsMap.master])
errors.addError('ERROR: Unknown master name: ' + paramsMap.master);
if (errors.hasErrors()) {
errors.show();
window.location.hash = window.location.hash.replace('master=' + paramsMap.master, '');
} else {
var groupIndex = paramsMap.master == 'ChromiumWebkit' ? 1 : 0;
paramsMap.group = builders.masters[paramsMap.master].groups[groupIndex];
var master = builders.urlNameToMasterName[paramsMap.master] || paramsMap.master;
var groupIndex = master == 'ChromiumWebkit' ? 1 : 0;
paramsMap.group = builders.masters[master].groups[groupIndex];
window.location.hash = window.location.hash.replace('master=' + paramsMap.master, 'group=' + encodeURIComponent(paramsMap.group));
delete paramsMap.master;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment