summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-31 19:28:54 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-31 19:28:54 +0000
commitd95790580eec199d664a2c1e34fcc112a9c2cecf (patch)
treec6873ef928ab693547d179500676432e8116efb5
parent509e98aaa6946ba344bdbad178bf7bd004a79ec6 (diff)
downloadchromium_src-d95790580eec199d664a2c1e34fcc112a9c2cecf.zip
chromium_src-d95790580eec199d664a2c1e34fcc112a9c2cecf.tar.gz
chromium_src-d95790580eec199d664a2c1e34fcc112a9c2cecf.tar.bz2
Linux: test_expectations from the WebKit merge
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12890 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index fe2d2f3..97b7d2e 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2416,7 +2416,7 @@ DEFER : LayoutTests/fast/forms/range-thumb-height-percentage.html = FAIL
// These probably just need rebaselining after http://trac.webkit.org/changeset/42131 BUG:9578
WIN : LayoutTests/fast/css/shadow-multiple.html = FAIL
-WIN : LayoutTests/fast/loader/reload-policy-delegate.html = FAIL
+WIN LINUX : LayoutTests/fast/loader/reload-policy-delegate.html = FAIL
WIN : LayoutTests/fast/repaint/shadow-multiple-horizontal.html = FAIL
WIN : LayoutTests/fast/repaint/shadow-multiple-strict-horizontal.html = FAIL
WIN : LayoutTests/fast/repaint/shadow-multiple-strict-vertical.html = FAIL
@@ -2431,4 +2431,4 @@ WIN : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post.html = FA
WIN : LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
WIN : LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
WIN : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL
-WIN : LayoutTests/fast/loader/simultaneous-reloads-assert.html = TIMEOUT
+WIN LINUX : LayoutTests/fast/loader/simultaneous-reloads-assert.html = TIMEOUT