Fix bug in calculating which expecations apply for a given test.

This would fail in the following case:

LINUX : foo/bar = TIMEOUT
foo/bar/baz.html = FAIL

On linux, it would think the expecations are to timeout.
Review URL: http://codereview.chromium.org/334011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29981 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 7 deletions

diff --git a/webkit/tools/layout_tests/flakiness_dashboard.html b/webkit/tools/layout_tests/flakiness_dashboard.html
index ba3cc73..b7763c0 100644
--- a/webkit/tools/layout_tests/flakiness_dashboard.html
+++ b/webkit/tools/layout_tests/flakiness_dashboard.html
@@ -726,20 +726,23 @@
   }
 
   function addTestToAllExpectations(test, expectations) {
-    if (!allExpectations[test])
-      allExpectations[test] = {};
-
-    var testHolder = allExpectations[test];
-
     for (var j = 0; j < expectations.length; j++) {
       var modifiers = expectations[j].modifiers.split(' ');
       addFallbacks(function(platformKey) {
+        // Setting the ALL key overrides any previously seen expectations.
+        if (platformKey == ALL || !allExpectations[test])
+          allExpectations[test] = {};
+
+        var testHolder = allExpectations[test];
         if (!testHolder[platformKey])
           testHolder[platformKey] = {}
 
-        var platformHolder = testHolder[platformKey];
         addFallbacks(function(buildTypeKey) {
-          platformHolder[buildTypeKey] = expectations[j];
+          // Setting the ALL key overrides any previously seen expectations.
+          if (buildTypeKey == ALL || !testHolder[platformKey])
+            testHolder[platformKey] = {}
+
+          testHolder[platformKey][buildTypeKey] = expectations[j];
         }, modifiers, BUILD_TYPES);
       }, modifiers, PLATFORMS);
     }