summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 16:31:14 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 16:31:14 +0000
commitc0cfd352357c56887c07f5ea28259b0c81b0b3f1 (patch)
tree2907189f4654c539fd2cdb320fba44b3c9f7a549 /webkit
parentd79302755a94aa530df7d71c7bf36bd54392fa7b (diff)
downloadchromium_src-c0cfd352357c56887c07f5ea28259b0c81b0b3f1.zip
chromium_src-c0cfd352357c56887c07f5ea28259b0c81b0b3f1.tar.gz
chromium_src-c0cfd352357c56887c07f5ea28259b0c81b0b3f1.tar.bz2
More expectation changes from the WebKit merge.
Review URL: http://codereview.chromium.org/115928 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1c0eca7..8edc186 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2657,7 +2657,7 @@ BUG12753 : LayoutTests/fast/dynamic/window-scrollbars-test.html = FAIL
// WebKit 44202:44252 introduced new crashes. There appears to be some flakyness
// here where sometimes some tests pass or crash.
-BUG12860 : LayoutTests/http/tests/security/cross-frame-access-document-direct.html = CRASH
+BUG12860 : LayoutTests/http/tests/security/cross-frame-access-document-direct.html = CRASH TIMEOUT
BUG12860 : LayoutTests/http/tests/security/listener/xss-window-onclick-shortcut.html = CRASH
BUG12860 : LayoutTests/http/tests/xmlhttprequest/event-listener-gc.html = CRASH
BUG12860 : LayoutTests/http/tests/xmlhttprequest/infoOnProgressEvent.html = CRASH
@@ -2666,6 +2666,7 @@ BUG12860 : LayoutTests/http/tests/xmlhttprequest/web-apps/003.html = CRASH PASS
BUG12860 : LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-006.html = CRASH PASS
BUG12860 : LayoutTests/http/tests/xmlhttprequest/web-apps/002-simple.html = CRASH PASS
BUG12860 : LayoutTests/fast/frames/iframe-name-and-id.html = CRASH PASS
+BUG12860 LINUX : LayoutTests/http/tests/security/cross-frame-access-delete.html = CRASH
// WebKit 44202:44252 introduced new tests
BUG12881 : LayoutTests/fast/js/string-replace-exception-crash.html = FAIL
@@ -2678,4 +2679,5 @@ BUG12881 : LayoutTests/fast/borders/border-radius-split-inline.html = FAIL
// WebKit 44202:44252 introduced new failures (old tests)
BUG12882 WIN : LayoutTests/fast/dom/HTMLObjectElement/object-as-frame.html = FAIL
BUG12882 WIN : LayoutTests/fast/box-shadow/basic-shadows.html = FAIL
-BUG12882 WIN : LayoutTests/fast/dom/Window/open-existing-pop-up-blocking.html = TIMEOUT
+BUG12882 : LayoutTests/fast/dom/Window/open-existing-pop-up-blocking.html = TIMEOUT
+BUG12882 LINUX : LayoutTests/fast/dom/Window/window-early-properties.html = CRASH