summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-28 06:38:53 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-28 06:38:53 +0000
commitf467a7991995e63b6ef9470b5c1f0aaa3929979a (patch)
tree3d9639d50d83abdcd48a00b03f67a2e35d0772aa
parent57cffe91cb67e26b26cf6d47db283eda00966b5b (diff)
downloadchromium_src-f467a7991995e63b6ef9470b5c1f0aaa3929979a.zip
chromium_src-f467a7991995e63b6ef9470b5c1f0aaa3929979a.tar.gz
chromium_src-f467a7991995e63b6ef9470b5c1f0aaa3929979a.tar.bz2
Testing if the last merge' failures are reproducible on build bots. Wish we had try bots which run layout tests.
Will revert if it causes redness. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12737 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index e603504..dbdcc02 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2355,7 +2355,7 @@ DEFER WIN MAC LINUX : LayoutTests/compositing/overflow/parent-overflow.html = FA
DEFER WIN MAC LINUX : LayoutTests/fast/backgrounds/svg-as-background-4.html = FAIL
// Merge WebKit: 41999:42026.
-BUG 9465 DEFER WIN : LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
-BUG 9465 DEFER WIN : LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
-BUG 9465 DEFER WIN : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL
-BUG 9465 DEFER WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT
+//BUG 9465 DEFER WIN : LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
+//BUG 9465 DEFER WIN : LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
+//BUG 9465 DEFER WIN : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL
+//BUG 9465 DEFER WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT