summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-17 19:09:43 +0000
committeryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-17 19:09:43 +0000
commit2953d589abc2a6f96e1f96b941c19525444948fd (patch)
tree4cc117156532072af750e6cd614427aa22709fc8 /webkit
parentafe3a16739185a648a21a34e07f3cdb5f1a23c2f (diff)
downloadchromium_src-2953d589abc2a6f96e1f96b941c19525444948fd.zip
chromium_src-2953d589abc2a6f96e1f96b941c19525444948fd.tar.gz
chromium_src-2953d589abc2a6f96e1f96b941c19525444948fd.tar.bz2
WebKit roll 51062:51075
Review URL: http://codereview.chromium.org/404008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt15
1 files changed, 13 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 9191891..4e20f08 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2397,8 +2397,8 @@ BUG10473 LINUX : LayoutTests/fast/forms/searchfield-heights.html = FAIL
BUG10473 LINUX : LayoutTests/fast/replaced/width100percent-searchfield.html = FAIL
// Changed in http://trac.webkit.org/changeset/42082
-BUG20570 : LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html = TIMEOUT
-BUG20570 : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT
+// TODO(YUKOT): uncomment BUG20570 : LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html = TIMEOUT
+// TODO(YUKOT): uncomment BUG20570 : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT
BUG20570 : LayoutTests/http/tests/navigation/onload-navigation-iframe-2.html = TIMEOUT
// This test isn't just slow -- sometimes it times out indefinitely.
@@ -3073,3 +3073,14 @@ BUG27849 : LayoutTests/http/tests/security/isolatedWorld/didClearWindowObject.ht
// Failures from merge 51042:51062
BUG27923: LayoutTests/accessibility/aria-labelledby-overrides-label.html = TEXT
+
+// Failures from merge 51062:51075
+BUGYAAR WIN LINUX : LayoutTests/fast/inspector-support/matchedrules.html = IMAGE+TEXT
+BUG27996 : LayoutTests/fast/inspector-support/uncaught-dom1-exception.html = TEXT
+BUG27996 : LayoutTests/fast/inspector-support/uncaught-dom3-exception.html = TEXT
+BUG27996 : LayoutTests/fast/inspector-support/uncaught-dom8-exception.html = TEXT
+BUGYUKOT : LayoutTests/fast/forms/get-forms-to-about-blank.html = FAIL
+// TODO(YUKOT): Uncomment previous timeout expectations (above) for the following 2 layout tests.
+BUGYUKOT : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = FAIL
+BUGYUKOT : LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html = FAIL
+