summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-25 23:10:07 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-25 23:10:07 +0000
commit239e3521507a1bcc76c27a51c4b98f0a5d6ec347 (patch)
treec4107e8fb7555add1277062db92c34f0a814323f /webkit
parent28a773043bfa5b11ed19a4fa7279aacbc9bb23c5 (diff)
downloadchromium_src-239e3521507a1bcc76c27a51c4b98f0a5d6ec347.zip
chromium_src-239e3521507a1bcc76c27a51c4b98f0a5d6ec347.tar.gz
chromium_src-239e3521507a1bcc76c27a51c4b98f0a5d6ec347.tar.bz2
Linux: update test expectations for merge failures.
(These are failures not caused by the scrollbars change) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt25
1 files changed, 12 insertions, 13 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index aae1101..37f17fd 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2279,22 +2279,22 @@ DEFER WIN LINUX : LayoutTests/fast/replaced/percent-height-in-anonymous-block-in
DEFER WIN LINUX : LayoutTests/http/tests/misc/generated-content-inside-table.html = FAIL
// New failures from merge
-DEFER WIN : LayoutTests/editing/selection/hit-test-anonymous.html = FAIL
-DEFER WIN : LayoutTests/fast/clip/016.html = FAIL
-DEFER WIN : LayoutTests/fast/clip/outline-overflowClip.html = FAIL
-DEFER WIN : LayoutTests/fast/css/clip-zooming.html = FAIL
+DEFER WIN LINUX : LayoutTests/editing/selection/hit-test-anonymous.html = FAIL
+DEFER WIN LINUX : LayoutTests/fast/clip/016.html = FAIL
+DEFER WIN LINUX : LayoutTests/fast/clip/outline-overflowClip.html = FAIL
+DEFER WIN LINUX : LayoutTests/fast/css/clip-zooming.html = FAIL
DEFER WIN : LayoutTests/fast/css/rtl-ordering.html = FAIL
DEFER WIN : LayoutTests/fast/encoding/denormalised-voiced-japanese-chars.html = FAIL
DEFER WIN : LayoutTests/fast/forms/input-appearance-height.html = FAIL
-DEFER WIN : LayoutTests/fast/forms/listbox-hit-test-zoomed.html = FAIL
-DEFER WIN : LayoutTests/fast/forms/search-zoomed.html = FAIL
+DEFER WIN LINUX : LayoutTests/fast/forms/listbox-hit-test-zoomed.html = FAIL
+DEFER WIN LINUX : LayoutTests/fast/forms/search-zoomed.html = FAIL
DEFER WIN : LayoutTests/fast/forms/select-visual-hebrew.html = FAIL
DEFER WIN : LayoutTests/fast/forms/slider-mouse-events.html = FAIL
DEFER WIN : LayoutTests/fast/forms/slider-onchange-event.html = FAIL
DEFER WIN : LayoutTests/fast/forms/slider-padding.html = FAIL
DEFER WIN : LayoutTests/fast/forms/slider-thumb-shared-style.html = FAIL
DEFER WIN : LayoutTests/fast/forms/slider-transformed.html = FAIL
-DEFER WIN : LayoutTests/fast/forms/slider-zoomed.html = FAIL
+DEFER WIN LINUX : LayoutTests/fast/forms/slider-zoomed.html = FAIL
DEFER WIN : LayoutTests/fast/forms/visual-hebrew-text-field.html = FAIL
DEFER WIN : LayoutTests/fast/lists/w3-list-styles.html = FAIL
DEFER WIN : LayoutTests/fast/text/international/001.html = FAIL
@@ -2305,15 +2305,15 @@ DEFER WIN : LayoutTests/http/tests/security/cross-frame-access-protocol-explicit
DEFER WIN : LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
DEFER WIN : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL
DEFER WIN : LayoutTests/svg/W3C-SVG-1.1/animate-elem-36-t.svg = FAIL
-DEFER WIN : LayoutTests/svg/W3C-SVG-1.1/animate-elem-39-t.svg = FAIL
+DEFER WIN LINUX : LayoutTests/svg/W3C-SVG-1.1/animate-elem-39-t.svg = FAIL
DEFER WIN : LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t.svg = FAIL
DEFER WIN : LayoutTests/svg/W3C-SVG-1.1/text-intro-05-t.svg = FAIL
DEFER WIN : LayoutTests/svg/carto.net/scrollbar.svg = FAIL
DEFER WIN : LayoutTests/svg/carto.net/selectionlist.svg = FAIL
-DEFER WIN : LayoutTests/svg/custom/focus-ring.svg = FAIL
-DEFER WIN : LayoutTests/svg/custom/image-parent-translation.xhtml = FAIL
-DEFER WIN : LayoutTests/svg/custom/js-update-image.svg = FAIL
-DEFER WIN : LayoutTests/svg/custom/text-image-opacity.svg = FAIL
+DEFER WIN LINUX : LayoutTests/svg/custom/focus-ring.svg = FAIL
+DEFER WIN LINUX : LayoutTests/svg/custom/image-parent-translation.xhtml = FAIL
+DEFER WIN LINUX : LayoutTests/svg/custom/js-update-image.svg = FAIL
+DEFER WIN LINUX: LayoutTests/svg/custom/text-image-opacity.svg = FAIL
DEFER WIN : LayoutTests/svg/text/text-fonts-01-t.svg = FAIL
DEFER WIN : LayoutTests/svg/text/text-intro-05-t.svg = FAIL
DEFER WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT
@@ -2326,4 +2326,3 @@ DEFER MAC : LayoutTests/http/tests/security/originHeader/origin-header-for-post.
DEFER MAC : LayoutTests/http/tests/xmlhttprequest/cookies.html = FAIL
DEFER MAC : LayoutTests/http/tests/xmlhttprequest/get-dangerous-headers.html = FAIL
DEFER MAC : LayoutTests/http/tests/xmlhttprequest/post-content-type.html = FAIL
-