diff options
| author | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 06:24:13 +0000 |
|---|---|---|
| committer | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 06:24:13 +0000 |
| commit | 1b9cad81c98ec37ce2f6b4c3ef47571efc61bd3d (patch) | |
| tree | 86691999bc0a6c668bc6d312a3d6aec5566b4bec /webkit/tools | |
| parent | 3e2a2ba243723b4e8b76489ecfc3b1f8e1beea9f (diff) | |
| download | chromium_src-1b9cad81c98ec37ce2f6b4c3ef47571efc61bd3d.zip chromium_src-1b9cad81c98ec37ce2f6b4c3ef47571efc61bd3d.tar.gz chromium_src-1b9cad81c98ec37ce2f6b4c3ef47571efc61bd3d.tar.bz2 | |
webkit merge 39000:39050, src
review: http://codereview.chromium.org/13697
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 8 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_ignored.txt | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index 21d0a29..22107eb 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -257,10 +257,6 @@ LayoutTests/plugins/bindings-test.html = FAIL CRASH // subframes are not data URLs (probably we want files in the resources dir.). LayoutTests/fast/encoding/char-encoding.html = FAIL -// This test should pass once we merge with r39021 or later. After the merge, -// fast/encoding/char-decoding-mac.html should be added to tests_ignored.txt. -LayoutTests/fast/encoding/char-decoding.html = FAIL - // Bug 1130795: since we don't have Aqua-themed controls, don't ignore the // box-shadow properties of controls that request Aqua theming. But since Aqua // controls are rare on the web, defer this fix. @@ -2035,4 +2031,8 @@ DEBUG : LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-ry-attr.html = CRA LINUX : LayoutTests/fast/events/5056619.html = PASS FAIL // Started failing with r6667 I think. (darin) +LayoutTests/fast/dom/javascript-url-crash-function.html = CRASH WIN : LayoutTests/http/tests/misc/font-face-in-multiple-segmented-faces.html = CRASH + +// Webkit merge 39000:39050 failures: +LayoutTests/fast/css/acid2-pixel.html = TIMEOUT diff --git a/webkit/tools/layout_tests/test_lists/tests_ignored.txt b/webkit/tools/layout_tests/test_lists/tests_ignored.txt index 6d3e999..e3f60ea 100644 --- a/webkit/tools/layout_tests/test_lists/tests_ignored.txt +++ b/webkit/tools/layout_tests/test_lists/tests_ignored.txt @@ -191,3 +191,6 @@ LINUX : chrome/fonts/impact.html = FAIL // repeatedly creates big regular expressions. All the test is trying // to verify is that we don't crash on this page. LayoutTests/fast/js/regexp-charclass-crash.html = PASS TIMEOUT + +// Test to verify legacy MAC encodings. +LayoutTests/fast/encoding/char-decoding-mac.html = FAIL
\ No newline at end of file |