summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-24 00:18:46 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-24 00:18:46 +0000
commitd4f2051e39e5a8e97b8c2ad4b033fdd68c86c827 (patch)
tree514f01201f40cf48b7f3075e128836c0a1d0db07
parent4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42 (diff)
downloadchromium_src-d4f2051e39e5a8e97b8c2ad4b033fdd68c86c827.zip
chromium_src-d4f2051e39e5a8e97b8c2ad4b033fdd68c86c827.tar.gz
chromium_src-d4f2051e39e5a8e97b8c2ad4b033fdd68c86c827.tar.bz2
Update test list post merge.
TBR=ojan Review URL: http://codereview.chromium.org/52035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12327 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index a4dd2ea..cf32cfa 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -2225,7 +2225,6 @@ MAC : LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-po
// Merge 41827:41860 Regressions
// Upstream r41849 added a large regex to this test which times out in V8.
LayoutTests/fast/js/regexp-overflow.html = TIMEOUT
-WIN : LayoutTests/fast/css/shadow-multiple.html = FAIL
MAC : LayoutTests/fast/canvas/set-colors.html = FAIL
MAC : LayoutTests/http/tests/xmlhttprequest/origin-header-same-origin-get-async.html = TIMEOUT
LINUX DEBUG : LayoutTests/fast/forms/input-align-image.html = FAIL
@@ -2258,3 +2257,10 @@ SKIP : LayoutTests/platform/mac/fast/text/international/Geeza-Pro-vertical-metri
// Started failing when test_fixable got merged with test_ignored.
LINUX DEBUG : chrome/fast/dom/htmliframeelement-document.html = FAIL
+
+// Merge 41860:41906 Regressions
+WIN : LayoutTests/fast/js/invalid-syntax-for-function.html = FAIL
+
+// Merge 41860:41906 New tests
+DEFER WIN : LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table.html = FAIL
+DEFER WIN : LayoutTests/http/tests/misc/generated-content-inside-table.html = FAIL