summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests/dashboards/dashboard_base.js
diff options
context:
space:
mode:
authorojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 00:08:28 +0000
committerojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 00:08:28 +0000
commit3848a1d323dd27c4a14816ef124ec6ab25f192bb (patch)
treebfa7b8af9a4ca8fed27ca838f87e86a7490a32cf /webkit/tools/layout_tests/dashboards/dashboard_base.js
parent8946c559f53a8a95702490ee9cc52f63632550e3 (diff)
downloadchromium_src-3848a1d323dd27c4a14816ef124ec6ab25f192bb.zip
chromium_src-3848a1d323dd27c4a14816ef124ec6ab25f192bb.tar.gz
chromium_src-3848a1d323dd27c4a14816ef124ec6ab25f192bb.tar.bz2
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
Diffstat (limited to 'webkit/tools/layout_tests/dashboards/dashboard_base.js')
-rw-r--r--webkit/tools/layout_tests/dashboards/dashboard_base.js13
1 files changed, 8 insertions, 5 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_;
}
/**