diff options
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/compare_failures.py | 7 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/test_expectations.py | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/webkit/tools/layout_tests/layout_package/compare_failures.py b/webkit/tools/layout_tests/layout_package/compare_failures.py index 85a5153..2e5dff3 100644 --- a/webkit/tools/layout_tests/layout_package/compare_failures.py +++ b/webkit/tools/layout_tests/layout_package/compare_failures.py @@ -118,7 +118,8 @@ class CompareFailures: 'CRASH') PrintFilesFromSet(self._missing, "Missing expected results", - output) + output, + 'MISSING') def _CalculateRegressions(self): """Calculate regressions from this run through the layout tests.""" @@ -156,7 +157,9 @@ class CompareFailures: # expected files. elif (is_missing and not self._expectations.IsRebaselining(test) and - not self._expectations.IsIgnored(test)): + not self._expectations.IsIgnored(test) and + (test_expectations.MISSING not in + self._expectations.GetExpectations(test))): missing.add(test) elif is_image_failure and is_text_failure: if (not test_expectations.FAIL in expectations and diff --git a/webkit/tools/layout_tests/layout_package/test_expectations.py b/webkit/tools/layout_tests/layout_package/test_expectations.py index 6dc0463..190b917 100644 --- a/webkit/tools/layout_tests/layout_package/test_expectations.py +++ b/webkit/tools/layout_tests/layout_package/test_expectations.py @@ -19,7 +19,7 @@ import simplejson # Test expectation and modifier constants. (PASS, FAIL, TEXT, IMAGE, IMAGE_PLUS_TEXT, TIMEOUT, CRASH, SKIP, WONTFIX, - DEFER, SLOW, REBASELINE, NONE) = range(13) + DEFER, SLOW, REBASELINE, MISSING, NONE) = range(14) # Test expectation file update action constants (NO_CHANGE, REMOVE_TEST, REMOVE_PLATFORM, ADD_PLATFORMS_EXCEPT_THIS) = range(4) @@ -216,7 +216,8 @@ class TestExpectationsFile: 'image': IMAGE, 'image+text': IMAGE_PLUS_TEXT, 'timeout': TIMEOUT, - 'crash': CRASH } + 'crash': CRASH, + 'missing': MISSING } PLATFORMS = [ 'mac', 'linux', 'win', 'win-xp', 'win-vista', 'win-7' ] |