summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 02:18:47 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 02:18:47 +0000
commit06e49109cae0b673fb0c021c2673653a9e61d128 (patch)
tree1c2a7b30fd4674be86dbf77427cb7514dcfcaac5 /webkit
parente22b0035c362fdaf5d5027f86ee13b462147b235 (diff)
downloadchromium_src-06e49109cae0b673fb0c021c2673653a9e61d128.zip
chromium_src-06e49109cae0b673fb0c021c2673653a9e61d128.tar.gz
chromium_src-06e49109cae0b673fb0c021c2673653a9e61d128.tar.bz2
Roll webkit to 51615, disable flaky/broken test added in 51615.
BUG=29251 TBR=ajwong TEST=none Review URL: http://codereview.chromium.org/460032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 4913614..6498abf 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3043,3 +3043,5 @@ BUG29259 LINUX : LayoutTests/fast/layers/self-painting-outline.html = IMAGE
BUG29259 LINUX : LayoutTests/fast/repaint/inline-relative-positioned.html = IMAGE
BUG29259 LINUX : LayoutTests/svg/W3C-SVG-1.1/filters-image-01-b.svg = IMAGE
+// Failure from WebKit merge 51613:51615 (51615 is the cause)
+BUG29251: LayoutTests/websocket/tests/simple.html = PASS FAIL