summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-29 21:27:46 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-29 21:27:46 +0000
commit313b4919bf602a4b20bf7e8e0586d613b3fa5dc2 (patch)
tree343c026f5002fe9bdcd5e185219ccba176836a05
parent7c099fd6b419066e63ddcdeff567a1984d408f55 (diff)
downloadchromium_src-313b4919bf602a4b20bf7e8e0586d613b3fa5dc2.zip
chromium_src-313b4919bf602a4b20bf7e8e0586d613b3fa5dc2.tar.gz
chromium_src-313b4919bf602a4b20bf7e8e0586d613b3fa5dc2.tar.bz2
layout tests: more merge fallout.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14890 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a1d5789..3ebe251 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2490,7 +2490,7 @@ BUG10861 WIN LINUX MAC : LayoutTests/fast/dom/xmlhttprequest-constructor-in-det
BUG10861 WIN : LayoutTests/security/block-test.html = FAIL
BUG10861 WIN : LayoutTests/http/tests/plugins/post-url-file.html = PASS
BUG10861 MAC : LayoutTests/http/tests/plugins/post-url-file.html = TIMEOUT
-BUG10861 LINUX MAC : LayoutTests/security/set-form-autocomplete-attribute.html = TIMEOUT
+BUG10861 LINUX MAC : LayoutTests/security/set-form-autocomplete-attribute.html = TIMEOUT PASS
BUG10861 MAC : LayoutTests/svg/custom/js-late-marker-creation.svg = FAIL
BUG10861 LINUX : LayoutTests/fast/dynamic/001.html = FAIL
@@ -2610,3 +2610,7 @@ BUG11178 MAC : LayoutTests/fast/dom/Document/open-with-pending-load.html = CRASH
// New tests from WebKit Merge 42932:42994
BUG11179 DEFER : LayoutTests/http/tests/xmlhttprequest/detaching-frame-2.html = FAIL
+BUG11179 LINUX : LayoutTests/editing/deleting/type-delete-after-quote.html = FAIL
+BUG11179 MAC LINUX : LayoutTests/webarchive/adopt-attribute-styled-body-webarchive.html = FAIL
+BUG11179 MAC LINUX : LayoutTests/webarchive/adopt-attribute-styled-node-webarchive.html = FAIL
+BUG11179 MAC LINUX : LayoutTests/webarchive/adopt-inline-styled-node-webarchive.html = FAIL