summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 17:10:12 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 17:10:12 +0000
commit58f0bf6f76dcf9cd4dc48b1699e5313d4694825a (patch)
tree9ee2dc502e9aeae348de4d1f610d9139378f5e5d /webkit/tools/layout_tests
parent15f633d4fde1ee0001ef4e1ecc0ca4d1ab8aaa43 (diff)
downloadchromium_src-58f0bf6f76dcf9cd4dc48b1699e5313d4694825a.zip
chromium_src-58f0bf6f76dcf9cd4dc48b1699e5313d4694825a.tar.gz
chromium_src-58f0bf6f76dcf9cd4dc48b1699e5313d4694825a.tar.bz2
Merge WebKit r42737, which added port 3659
(apple-sasl / PasswordServer) to the list of blocked ports and to LayoutTests/security/block-test.html. Fix cpplint.py nits. R=eroman BUG=http://crbug.com/10861 TEST=LayoutTests/security/block-test.html should pass on Windows Review URL: http://codereview.chromium.org/147069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 4b27171..e9653dc 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2285,7 +2285,6 @@ BUG10859 LINUX MAC : LayoutTests/fast/dom/HTMLSelectElement/named-options.html =
BUG10861 WIN : LayoutTests/fast/dom/HTMLSelectElement/named-options.html = FAIL
// New failures from WebKit Merge 42671:42725
-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 PASS