summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 02:22:56 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 02:22:56 +0000
commit71dabf3b19f909b068df1f075571e3c51e436381 (patch)
tree4c94531a24f2a6a7e8e6c71246f35f5ee8f31fe6 /webkit
parentd7bdd38851d9f435577f37bb7cd8028d4a22330f (diff)
downloadchromium_src-71dabf3b19f909b068df1f075571e3c51e436381.zip
chromium_src-71dabf3b19f909b068df1f075571e3c51e436381.tar.gz
chromium_src-71dabf3b19f909b068df1f075571e3c51e436381.tar.bz2
Try to make the Linux webkit builder happy. I used IMAGE+TEXT since this was
the failure on Mac, but apparently Linux's TEXT-only failure doesn't get covered by this rule. Trying "IMAGE TEXT" instead of "IMAGE+TEXT" to see if it fixes the problem. TEST=this is a friggin test BUG=none Review URL: http://codereview.chromium.org/391043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31879 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 2b5fa37..ec4d249 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2928,7 +2928,7 @@ BUG_JPARENT LINUX DEBUG SLOW : LayoutTests/fast/frames/calculate-fixed.html = PA
// Started crashing for no apparent reason at r28124
// IMAGE+TEXT failure is from WebKit 50804:50904, used to occationally pass
// before that.
-BUG23972 LINUX : LayoutTests/fast/forms/form-element-geometry.html = CRASH IMAGE+TEXT
+BUG23972 LINUX : LayoutTests/fast/forms/form-element-geometry.html = CRASH IMAGE TEXT
// Flaky timeouts first appearing at r27764 (webkit 48947)
BUG9798 RELEASE : LayoutTests/http/tests/cookies/multiple-cookies.html = TIMEOUT PASS
@@ -3126,11 +3126,11 @@ BUG27556 SKIP WIN LINUX : LayoutTests/websocket/tests = FAIL
BUG27555 WIN MAC : LayoutTests/fast/forms/form-element-geometry.html = IMAGE+TEXT
BUG27555 LINUX WIN MAC : LayoutTests/fast/forms/file-input-direction.html = TEXT
// This one's MAC IMAGE failure was previously covered by BUG23496.
-BUG27555 LINUX WIN MAC : LayoutTests/fast/forms/file-input-disabled.html = IMAGE+TEXT
+BUG27555 LINUX WIN MAC : LayoutTests/fast/forms/file-input-disabled.html = IMAGE TEXT
BUG27555 LINUX WIN MAC : LayoutTests/fast/forms/hidden-input-file.html = TEXT
// Input-appearance-height and input-value's MAC IMAGE failure was previously from bug 24721, the text failure is new.
-BUG27555 LINUX WIN MAC : LayoutTests/fast/forms/input-appearance-height.html = IMAGE+TEXT
-BUG27555 LINUX WIN MAC : LayoutTests/fast/forms/input-value.html = IMAGE+TEXT
+BUG27555 LINUX WIN MAC : LayoutTests/fast/forms/input-appearance-height.html = IMAGE TEXT
+BUG27555 LINUX WIN MAC : LayoutTests/fast/forms/input-value.html = IMAGE TEXT
BUG27555 LINUX : LayoutTests/fast/css/color-correction-on-box-shadow.html = IMAGE+TEXT
BUG27555 LINUX : LayoutTests/fast/css/color-correction-on-text-shadow.html = IMAGE+TEXT
BUG27555 LINUX : LayoutTests/fast/multicol/single-line.html = IMAGE+TEXT
@@ -3142,4 +3142,4 @@ BUG27555 MAC : LayoutTests/fast/forms/box-shadow-override.html = IMAGE+TEXT
BUG27555 SKIP LINUX WIN MAC : LayoutTests/media/media-fullscreen-inline.html = TIMEOUT
BUG27555 SKIP LINUX WIN MAC : LayoutTests/media/media-fullscreen-not-in-document.html = TIMEOUT
// No results:
-BUG27555 LINUX WIN MAC : LayoutTests/fast/forms/input-file-re-render.html = MISSING
+BUG27555 LINUX WIN MAC : LayoutTests/fast/forms/input-file-re-render.html = MISSING TEXT