summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-09 01:52:02 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-09 01:52:02 +0000
commit6225d4b4cd2e6388f50b312952fbd308ba224926 (patch)
tree4688ff7d353716099a9e7493da974c21f21a04c0
parentc702f03c0d09b937aaa6958ac4f5ff4bb33cf335 (diff)
downloadchromium_src-6225d4b4cd2e6388f50b312952fbd308ba224926.zip
chromium_src-6225d4b4cd2e6388f50b312952fbd308ba224926.tar.gz
chromium_src-6225d4b4cd2e6388f50b312952fbd308ba224926.tar.bz2
Fix bad merge of the test lists.
Review URL: http://codereview.chromium.org/20168 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9381 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 13ff6f6..3d1ad3d 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1760,12 +1760,10 @@ LINUX : LayoutTests/svg/text/text-path-01-b.svg = FAIL
// like it is using a different font to render now than it
// did before and that may be a bug. It looks like
// jshin@chromium.org did several font related changes in this merge.
-LayoutTests/fast/css/text-overflow-ellipsis.html = FAIL
-
LINUX WIN : LayoutTests/fast/css/text-overflow-ellipsis.html = FAIL
// Regressions from webkit merge 40668:40722
-LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT
+LINUX WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT
// This is related to merging EventTargetNode into Node, but I don't understand
// this well enough to know if this just needs a rebase. One of the V8 folk
// should take a look at this. The upstream expected results changed as well,