Fix logic for mapping expectations to a test for expectations

that are listed for entire directories.

TBR since the dashboard is broken and my gmail is down,
so I can't reasonably do a code review soon.

TBR=arv@chromium.org
BUG=none
TEST=manual
Review URL: http://codereview.chromium.org/182047

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

1 files changed, 13 insertions, 12 deletions

diff --git a/webkit/tools/layout_tests/flakiness_dashboard.html b/webkit/tools/layout_tests/flakiness_dashboard.html
index 5a8bfe8..33dfb53 100644
--- a/webkit/tools/layout_tests/flakiness_dashboard.html
+++ b/webkit/tools/layout_tests/flakiness_dashboard.html
@@ -464,17 +464,18 @@
     for (var path in expectationsByTest) {
       var expectations = expectationsByTest[path];
       if (!isDirectory(path) &&
-          !addTestAndExpectations(path, path, builderName, expectationsMap,
+          addTestAndExpectations(path, path, builderName, expectationsMap,
               expectations, testPrefixes)) {
-        // Test path doesn't match a specific test, see if it prefix matches
-        // any test.
-        for (var test in allTests) {
-          if (stringContains(test, path) &&
-              (!testPrefixes[test] ||
-               !stringContains(testPrefixes[test], path))) {
-            addTestAndExpectations(test, path, builderName, expectationsMap,
-                expectations, testPrefixes);
-          }
+        continue;
+      }
+      // Test path doesn't match a specific test, see if it prefix matches
+      // any test.
+      for (var test in allTests) {
+        if (stringContains(test, path) &&
+            (!testPrefixes[test] ||
+             !stringContains(testPrefixes[test], path))) {
+          addTestAndExpectations(test, path, builderName, expectationsMap,
+              expectations, testPrefixes);
         }
       }
     }
@@ -645,7 +646,7 @@
   function getHTMLForSingleTestRow(test, opt_builder) {
     var classes = [];
     if (!test.meetsExpectations)
-      classes.push('expectation-mismatch');
+      classes.push('wrong-expectations');
 
     if (test.isWontFix)
       classes.push('wontfix');
@@ -815,7 +816,7 @@
       }
       generatePageForBuilder(currentState.builder);
     }
-    logTime('Time to generate page', startTime);
+    logTime('Time to generate page (includes innerHTML)', startTime);
   }
 
   function generatePageForIndividualTests(tests) {