diff options
| author | jparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 18:12:29 +0000 |
|---|---|---|
| committer | jparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 18:12:29 +0000 |
| commit | 231e7ad8a7d5c1aab39bb6c4b5142787790d0e5f (patch) | |
| tree | a29d3307cca6ffa43f8bfaceda4e24ae33b8c231 /webkit/tools | |
| parent | 551f273e09a45747cb286258fe0a0e66eee728f4 (diff) | |
| download | chromium_src-231e7ad8a7d5c1aab39bb6c4b5142787790d0e5f.zip chromium_src-231e7ad8a7d5c1aab39bb6c4b5142787790d0e5f.tar.gz chromium_src-231e7ad8a7d5c1aab39bb6c4b5142787790d0e5f.tar.bz2 | |
Roll webkit 52229 -> 52254. Adds a few flaky tests to expectations as well (not related to roll, they have been flaky for a week).
TBR=pkasting
TEST=canary bots, try servers
BUG=9798
Review URL: http://codereview.chromium.org/502053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 74ebfe2..ee1b0d5 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3118,6 +3118,7 @@ BUG30593 LINUX MAC : LayoutTests/websocket/tests/url-with-credential.html = TEXT BUG9798 WIN LINUX : LayoutTests/fast/loader/javascript-url-encoding-2.html = TIMEOUT PASS BUG9798 WIN RELEASE : LayoutTests/fast/loading/subframe-removes-itself.html = TEXT PASS BUG9798 LINUX MAC RELEASE : LayoutTests/fast/loader/invalid-charset-on-script-crashes-loader.html = TIMEOUT PASS +BUG9798 MAC RELEASE : LayoutTests/fast/borders/block-mask-overlay-image.html = TEXT PASS // Webkit roll 52198->52205 // Newly added test in r52202 @@ -3130,5 +3131,8 @@ BUG_JPARENT WIN LINUX : LayoutTests/svg/custom/empty-merge.svg = IMAGE+TEXT // Flaky since SVG filters turned on BUG29737 LINUX : LayoutTests/svg/filters/feDisplacementMap.svg = TEXT PASS +// Newly added test in r52235 +BUG_JPARENT WIN LINUX : LayoutTests/editing/selection/doubleclick-beside-cr-span.html = TEXT + // Failing after chromium r34544. BUG30653 WIN DEBUG : LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe.html = TEXT |