summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authordglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 21:05:44 +0000
committerdglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 21:05:44 +0000
commit46e90c9970090aeffbb30f73495c866d30551cd5 (patch)
tree542ab0d78287848743e14599b5374def0f7e9fb0 /webkit/tools
parent78cee597d742db9f26833fb3411834fde2f922e7 (diff)
downloadchromium_src-46e90c9970090aeffbb30f73495c866d30551cd5.zip
chromium_src-46e90c9970090aeffbb30f73495c866d30551cd5.tar.gz
chromium_src-46e90c9970090aeffbb30f73495c866d30551cd5.tar.bz2
WebKit Merge 41768:41807, Chromium Side
R=ojan Review URL: http://codereview.chromium.org/42352 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index f218acf..b21ba18 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1866,3 +1866,11 @@ MAC : LayoutTests/fast/forms/select-max-length.html = TIMEOUT
LINUX MAC : LayoutTests/fast/js/large-expressions.html = FAIL
WIN DEBUG : LayoutTests/fast/js/large-expressions.html = FAIL
+
+// Merge 41768:41807
+// Perhaps just needs new baseline?
+MAC LINUX WIN : LayoutTests/editing/style/block-styles-007.html
+// These tests were rebaselined with failure long ago. We shouldn't do this, and
+// instead work upstream to improve tests so that they don't fail.
+DEFER : LayoutTests/fast/forms/textarea-appearance-wrap.html
+DEFER : LayoutTests/fast/forms/textarea-hard-linewrap.html