1. Make the strings used for non-webkit tests match the terminology

used in the test files.
2. Allow for window-style paths when searching for individual tests.

Review URL: http://codereview.chromium.org/1039009

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

2 files changed, 34 insertions, 20 deletions

diff --git a/webkit/tools/layout_tests/dashboards/dashboard_base.js b/webkit/tools/layout_tests/dashboards/dashboard_base.js
index f82fe7f..f3049f6 100644
--- a/webkit/tools/layout_tests/dashboards/dashboard_base.js
+++ b/webkit/tools/layout_tests/dashboards/dashboard_base.js
@@ -39,15 +39,19 @@ var defaultStateValues = {};
 //////////////////////////////////////////////////////////////////////////////
 // CONSTANTS
 //////////////////////////////////////////////////////////////////////////////
-var BASE_EXPECTATIONS_MAP_ = {
+var GTEST_EXPECTATIONS_MAP_ = {
   'P': 'PASS',
-  'F': 'TEXT',
+  'F': 'FAIL',
   'N': 'NO DATA',
-  'X': 'SKIP'
+  'X': 'DISABLED'
 };
 
 var LAYOUT_TEST_EXPECTATIONS_MAP_ = {
+  'P': 'PASS',
+  'N': 'NO DATA',
+  'X': 'SKIP',
   'T': 'TIMEOUT',
+  'F': 'TEXT',
   'C': 'CRASH',
   'I': 'IMAGE',
   'Z': 'IMAGE+TEXT',
@@ -55,7 +59,6 @@ var LAYOUT_TEST_EXPECTATIONS_MAP_ = {
   // are more precise now though and it just means MISSING.
   'O': 'MISSING'
 };
-LAYOUT_TEST_EXPECTATIONS_MAP_.__proto__ = BASE_EXPECTATIONS_MAP_;
 
 // Keys in the JSON files.
 var WONTFIX_COUNTS_KEY = 'wontfixCounts';
@@ -522,7 +525,7 @@ function getKeys(obj) {
  */
 function getExpectationsMap() {
   return isLayoutTestResults() ? LAYOUT_TEST_EXPECTATIONS_MAP_ :
-      BASE_EXPECTATIONS_MAP_;
+      GTEST_EXPECTATIONS_MAP_;
 }
 
 /**
diff --git a/webkit/tools/layout_tests/flakiness_dashboard.html b/webkit/tools/layout_tests/flakiness_dashboard.html
index 3ff3995..c5c4922 100644
--- a/webkit/tools/layout_tests/flakiness_dashboard.html
+++ b/webkit/tools/layout_tests/flakiness_dashboard.html
@@ -541,18 +541,29 @@
    * tests in the directory.
    */
   function getIndividualTests() {
-    if (!currentState.tests) {
+    if (!currentState.tests)
       return [];
-    } else if (currentState.tests == 'allSlowTests') {
-      return getSlowTests();
-    } else if (currentState.tests == 'allNeedSlowTests') {
-      return getNeedSlowTests();
-    } else if (currentState.tests == 'allIncorrectExpectations') {
-      return getAllTestsWithIncorrectExpectations();
+    
+    switch (currentState.tests) {
+      case 'allSlowTests':
+        return getSlowTests();
+      
+      case 'allNeedSlowTests':
+        return getNeedSlowTests();
+        
+      case 'allIncorrectExpectations':
+        return getAllTestsWithIncorrectExpectations();
+        
+      default:
+        return getIndividualTestsForSubstringList();
     }
+  }
 
-    var separator = stringContains(currentState.tests, ' ') ? ' ' : ',';
-    var testList = currentState.tests.split(separator);
+  function getIndividualTestsForSubstringList() {
+    // Convert windows slashes to unix slashes.
+    var tests = currentState.tests.replace(/\\/g, '/');
+    var separator = stringContains(tests, ' ') ? ' ' : ',';
+    var testList = tests.split(separator);
     
     if (!isLayoutTestResults()) {
       testList.forEach(function(element) {
@@ -568,7 +579,7 @@
 
     // Put the tests into an object first and then move them into an array
     // as a way of deduping.
-    var tests = {};
+    var testsMap = {};
     for (var i = 0; i < testList.length; i++) {
       var path = testList[i];
 
@@ -580,7 +591,7 @@
       var hasAnyMatches = false;
       for (var test in allTests) {
         if (caseInsensitiveContains(test, path)) {
-          tests[test] = 1;
+          testsMap[test] = 1;
           hasAnyMatches = true;
         }
       }
@@ -588,12 +599,12 @@
       // If a path doesn't match any tests, then assume it's a full path
       // to a test that passes on all builders.
       if (!hasAnyMatches) {
-        tests[path] = 1;
+        testsMap[path] = 1;
       }
     }
 
     var testsArray = [];
-    for (var test in tests) {
+    for (var test in testsMap) {
       testsArray.push(test);
     }
     return testsArray;
@@ -1357,8 +1368,8 @@
         innerHTML = currentTime || '&nbsp;';
       }
 
-      html += '<td title="' + resultString + '. Click for more info." ' +
-          'class="results ' + currentResult +
+      html += '<td title="' + (resultString || 'NO DATA') +
+          '. Click for more info." class="results ' + currentResult +
           '" onclick=\'showPopupForBuild(event, "' + builder + '",' + i +
           ',"' + test.test + '")\'>' + innerHTML + '</td>';