diff options
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/compare_failures.py | 4 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 5 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/test_expectations.txt | 3 |
3 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 80f435a..a9c71b9 100644 --- a/webkit/tools/layout_tests/layout_package/compare_failures.py +++ b/webkit/tools/layout_tests/layout_package/compare_failures.py @@ -144,7 +144,9 @@ class CompareFailures: if not test_expectations.TIMEOUT in expectations: hangs.add(test) # Do not add to the missing list if a test is rebaselining and missing # expected files. - elif is_missing and not self._expectations.IsRebaselining(test): + elif (is_missing and + not self._expectations.IsRebaselining(test) and + not self._expectations.IsIgnored(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/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index eb7c054..d9b6559 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -863,10 +863,13 @@ class TestRunner: """ failed = result_summary.fixable_count total = result_summary.all_fixable_count + passed = 0 + if total > 0: + passed = float(total - failed) * 100 / total output.write( "\nTest summary: %.1f%% Passed | %s Failures | %s Tests to pass for " "this release\n" % ( - float(total - failed) * 100 / total, failed, total)) + passed, failed, total)) self._PrintResultSummaryEntry( "Tests to be fixed for the current release", diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index c5eca1d..00b5e4d 100755 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2027,8 +2027,7 @@ BUG15217 MAC : LayoutTests/fast/js/switch-behaviour.html = FAIL BUG15270 : LayoutTests/fast/js/excessive-comma-usage.html = FAIL // WebKit 45247:45270 -BUG15478 SKIP : LayoutTests/fast/frames/viewsource-on-image-file.html = FAIL -BUG15478 SKIP : LayoutTests/platform/qt/fast/events/event-sender-keydown-frame.html = FAIL +BUG15478 : LayoutTests/fast/frames/viewsource-on-image-file.html = FAIL // WebKit 45270:45287 BUG15490 LINUX : LayoutTests/editing/deleting/25322-1.html = PASS FAIL CRASH |