summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 15:08:34 +0000
committeramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 15:08:34 +0000
commitf177e2d40c33a10c7cca4bfc7a28e6bf6838edf1 (patch)
tree2a65da7cfb9282f92c8e52381527b1b2de2d7a37 /webkit
parent41c4ccd7404be3ee2b875085410888760e685228 (diff)
downloadchromium_src-f177e2d40c33a10c7cca4bfc7a28e6bf6838edf1.zip
chromium_src-f177e2d40c33a10c7cca4bfc7a28e6bf6838edf1.tar.gz
chromium_src-f177e2d40c33a10c7cca4bfc7a28e6bf6838edf1.tar.bz2
Merge several variations on the same failure into one line.
Review URL: http://codereview.chromium.org/147083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 29d9759..4b27171 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1374,9 +1374,6 @@ BUG10361 WIN LINUX : LayoutTests/fast/repaint/outline-child-repaint.html = FAIL
// New test. We should fix it, but it doesn't need to block the current release
BUG10361 : LayoutTests/http/tests/misc/single-character-pi-stylesheet.xhtml = FAIL
-// MERGE 38729:38760: Regressions
-BUG10362 LINUX WIN : LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL
-
// Windows is missing the green box.
BUG8729 WIN : LayoutTests/http/tests/multipart/invalid-image-data.html = FAIL
@@ -1507,7 +1504,6 @@ BUG10381 MAC : LayoutTests/svg/W3C-SVG-1.1/animate-elem-46-t.svg = FAIL PASS
BUG10381 MAC : LayoutTests/svg/W3C-SVG-1.1/animate-elem-81-t.svg = FAIL PASS
BUG10381 MAC : LayoutTests/svg/W3C-SVG-1.1/animate-elem-85-t.svg = FAIL PASS
// This next one seems to be timing related (passes some times)
-BUG10381 DEBUG MAC : LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL PASS
BUG10381 DEBUG MAC : LayoutTests/editing/execCommand/paste-1.html = FAIL PASS
// These may be similar timing issue as above.
@@ -2225,7 +2221,7 @@ BUG9797 LINUX DEBUG : LayoutTests/svg/carto.net/tabgroup.svg = CRASH PASS
BUG9797 MAC WIN : LayoutTests/fast/body-propagation/overflow/004.html = FAIL PASS
BUG9797 MAC DEBUG : LayoutTests/tables/mozilla/bugs/bug137388-2.html = FAIL PASS
BUG9797 WIN DEBUG : LayoutTests/editing/execCommand/paste-1.html = FAIL PASS
-BUG9797 WIN DEBUG : LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL PASS
+BUG9797 : LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL PASS
BUG9797 WIN DEBUG : LayoutTests/fast/encoding/namespace-tolerance.html = CRASH PASS
BUG9797 WIN DEBUG : LayoutTests/fast/loader/file-URL-with-port-number.html = FAIL PASS
BUG9797 WIN DEBUG : LayoutTests/http/tests/navigation/lockedhistory-iframe.html = FAIL PASS