mozilla
/
treeherder
зеркало из https://github.com/mozilla/treeherder.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1210503 - Fix bad merge 

Lost changes in bug 1187000 when this was merged the first time, so e10s
results were not visible.
This commit is contained in:
William Lachance 2015-10-21 13:09:53 -04:00
Родитель c8f0ce658b
Коммит 4b499e4fde
1 изменённых файлов: 20 добавлений и 26 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

46
ui/js/perf.js
Просмотреть файл

@ -169,36 +169,30 @@ perf.factory('PhSeries', ['$http', 'thServiceDomain', function($http, thServiceD
return _getAllSeries(projectName, timeRange, optionMap).then(function(lists) {
var allSubtestSignatures = _.flatten(_.map(lists.seriesList, function(series) {
return series.subtestSignatures ? series.subtestSignatures : [];
}));
return series.subtestSignatures ? series.subtestSignatures : [];
}));
lists.seriesList.forEach(function(series) {
// Only keep summary signatures, filter in/out e10s
if ((userOptions.e10s && !_.contains(series.options, 'e10s')) ||
(!userOptions.e10s && _.contains(series.options, 'e10s'))) {
// Filter out subtests with a summary signature
if (!series.subtestSignatures) {
if (_.contains(allSubtestSignatures, series.signature)) {
return;
}
}
// We don't generate number for tp5n, this is xperf and we collect counters
if (_.contains(series.name, "tp5n"))
return;
if (_.contains(userOptions.excludedPlatforms, series.platform))
return;
} else {
// We should also filter out those subtest series but keep none summary one.
if (!series.subtestSignatures) {
if (_.contains(allSubtestSignatures, series.signature)) {
return;
}
}
// We don't generate number for tp5n, this is xperf and we collect counters
if (_.contains(series.name, "tp5n"))
return;
if (_.contains(userOptions.excludedPlatforms, series.platform))
return;
seriesList.push(series);
seriesList.push(series);
// add test/platform to lists if not yet present
if (!_.contains(platformList, series.platform)) {
platformList.push(series.platform);
}
if (!_.contains(testList, series.name)) {
testList.push(series.name);
}
} //if/else
// add test/platform to lists if not yet present
if (!_.contains(platformList, series.platform)) {
platformList.push(series.platform);
}
if (!_.contains(testList, series.name)) {
testList.push(series.name);
}
}); //lists.serieslist.forEach
return {