Title: [149605] trunk/Tools
- Revision
- 149605
- Author
- [email protected]
- Date
- 2013-05-06 10:44:16 -0700 (Mon, 06 May 2013)
Log Message
[Flakiness Dashboard] Remove the remaining traces of platform modifier unions
https://bugs.webkit.org/show_bug.cgi?id=114954
Reviewed by Ryosuke Niwa.
* TestResultServer/static-dashboards/flakiness_dashboard.js:
(processExpectationsForPlatform): Remove the platform tree traversal that checked for presence of the platform
modifier unions in the list of modifiers.
(generatePageForExpectationsUpdate): Only filter through the modifiers that do not represent build types or bug references.
* TestResultServer/static-dashboards/flakiness_dashboard_unittests.js: Adjust the test cases for the realModifiers unit test.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (149604 => 149605)
--- trunk/Tools/ChangeLog 2013-05-06 17:32:50 UTC (rev 149604)
+++ trunk/Tools/ChangeLog 2013-05-06 17:44:16 UTC (rev 149605)
@@ -1,5 +1,18 @@
2013-05-06 Zan Dobersek <[email protected]>
+ [Flakiness Dashboard] Remove the remaining traces of platform modifier unions
+ https://bugs.webkit.org/show_bug.cgi?id=114954
+
+ Reviewed by Ryosuke Niwa.
+
+ * TestResultServer/static-dashboards/flakiness_dashboard.js:
+ (processExpectationsForPlatform): Remove the platform tree traversal that checked for presence of the platform
+ modifier unions in the list of modifiers.
+ (generatePageForExpectationsUpdate): Only filter through the modifiers that do not represent build types or bug references.
+ * TestResultServer/static-dashboards/flakiness_dashboard_unittests.js: Adjust the test cases for the realModifiers unit test.
+
+2013-05-06 Zan Dobersek <[email protected]>
+
[Flakiness Dashboard] Simplify builder-name-based platform recognition
https://bugs.webkit.org/show_bug.cgi?id=114957
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js (149604 => 149605)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2013-05-06 17:32:50 UTC (rev 149604)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2013-05-06 17:44:16 UTC (rev 149605)
@@ -816,33 +816,6 @@
var modifiers = expectationsArray[i].modifiers;
var expectations = expectationsArray[i].expectations;
- var shouldProcessExpectation = false;
- var hasPlatformModifierUnions = false;
- if (platformObject.fallbackPlatforms) {
- platformObject.fallbackPlatforms.forEach(function(fallbackPlatform) {
- if (shouldProcessExpectation)
- return;
-
- var fallbackPlatformObject = platformObjectForName(fallbackPlatform);
- if (!fallbackPlatformObject.platformModifierUnions)
- return;
-
- modifiers.split(' ').forEach(function(modifier) {
- if (modifier in fallbackPlatformObject.platformModifierUnions) {
- hasPlatformModifierUnions = true;
- if (fallbackPlatformObject.platformModifierUnions[modifier].indexOf(platformName) != -1)
- shouldProcessExpectation = true;
- }
- });
- });
- }
-
- if (!hasPlatformModifierUnions)
- shouldProcessExpectation = true;
-
- if (!shouldProcessExpectation)
- continue;
-
getAllTestsTrie().forEach(function(triePath) {
addTestToAllExpectationsForPlatform(triePath, platformName, expectations, modifiers);
}, path);
@@ -1565,29 +1538,7 @@
{
var modifiers = modifierString.split(' ');;
return modifiers.filter(function(modifier) {
- if (modifier in BUILD_TYPES || string.startsWith(modifier, 'BUG'))
- return false;
-
- var matchesPlatformOrUnion = false;
- traversePlatformsTree(function(platform, platformName) {
- if (matchesPlatformOrUnion)
- return;
-
- if (platform.fallbackPlatforms) {
- platform.fallbackPlatforms.forEach(function(fallbackPlatform) {
- if (matchesPlatformOrUnion)
- return;
-
- var fallbackPlatformObject = platformObjectForName(fallbackPlatform);
- if (!fallbackPlatformObject.platformModifierUnions)
- return;
-
- matchesPlatformOrUnion = modifier in fallbackPlatformObject.subPlatforms || modifier in fallbackPlatformObject.platformModifierUnions;
- });
- }
- });
-
- return !matchesPlatformOrUnion;
+ return !(modifier in BUILD_TYPES || string.startsWith(modifier, 'BUG'));
}).join(' ');
}
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js (149604 => 149605)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js 2013-05-06 17:32:50 UTC (rev 149604)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js 2013-05-06 17:44:16 UTC (rev 149605)
@@ -171,8 +171,8 @@
});
test('realModifiers', 3, function() {
- equal(realModifiers('BUG(Foo) LINUX LION WIN DEBUG SLOW'), 'SLOW');
- equal(realModifiers('BUG(Foo) LUCID MAC XP RELEASE SKIP'), 'SKIP');
+ equal(realModifiers('BUG(Foo) DEBUG SLOW'), 'SLOW');
+ equal(realModifiers('BUG(Foo) RELEASE'), '');
equal(realModifiers('BUG(Foo)'), '');
});
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
