diff options
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index a356d39..f3a7a26 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1515,7 +1515,7 @@ BUG10370 MAC : LayoutTests/fast/css/font-weight-1.html = FAIL // not loading local files BUG10371 SLOW MAC : LayoutTests/fast/loader/local-CSS-from-local.html = FAIL -BUG10371 MAC : LayoutTests/fast/loader/local-JavaScript-from-local.html = FAIL +BUG10371 MAC : LayoutTests/fast/loader/local-JavaScript-from-local.html = FAIL TIMEOUT BUG10371 MAC : LayoutTests/fast/loader/local-image-from-local.html = FAIL // whitespace differences (??) @@ -2240,7 +2240,8 @@ BUG9704 : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIME // Merge WebKit: 42026:42115 new tests BUG10475 DEFER WIN LINUX : LayoutTests/fast/block/positioning/negative-rel-position.html = FAIL -BUG10475 SLOW DEFER : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html = FAIL +BUG10475 SLOW WIN LINUX DEFER : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html = FAIL +BUG10475 MAC DEFER : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html = FAIL TIMEOUT BUG10475 DEFER WIN LINUX : LayoutTests/fast/forms/range-thumb-height-percentage.html = FAIL DEFER SKIP BUG9613 : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = PASS |