diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 19:41:00 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 19:41:00 +0000 |
| commit | 5eb55c2f42f70fe544a04d200cdd059377d310f7 (patch) | |
| tree | b837cdb6f59622d004d44ca3be4e90281177cfd6 /webkit | |
| parent | 70ab61c9109f3626b44f2bee96de626d0acf8442 (diff) | |
| download | chromium_src-5eb55c2f42f70fe544a04d200cdd059377d310f7.zip chromium_src-5eb55c2f42f70fe544a04d200cdd059377d310f7.tar.gz chromium_src-5eb55c2f42f70fe544a04d200cdd059377d310f7.tar.bz2 | |
Webkit merge from r44682 to r44699.
Not much here, just one layout test that changed expectations.
Added some flakey video tests to the list while I'm at it.
Review URL: http://codereview.chromium.org/126174
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 553cb3c..5a32e23 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -637,7 +637,7 @@ BUG13907 WIN : LayoutTests/media/video-aspect-ratio.html = FAIL BUG13907 WIN : LayoutTests/media/video-buffered.html = FAIL CRASH BUG13907 WIN : LayoutTests/media/video-can-play-type.html = FAIL // This test crashes in debug build. -BUG13907 WIN : LayoutTests/media/video-click-dblckick-standalone.html = PASS CRASH +BUG13907 WIN : LayoutTests/media/video-click-dblckick-standalone.html = PASS TIMEOUT CRASH // This test crashes in debug build. BUG13907 WIN : LayoutTests/media/video-controls.html = PASS CRASH // This test crashes in release build. @@ -656,7 +656,7 @@ BUG13907 WIN : LayoutTests/media/video-dom-src.html = PASS CRASH // This test is flaky. BUG13907 WIN DEBUG : LayoutTests/media/video-dom-autobuffer.html = PASS FAIL // This test crashes in debug build. -BUG13907 WIN : LayoutTests/media/video-document-types.html = PASS CRASH +BUG13907 WIN : LayoutTests/media/video-document-types.html = PASS FAIL CRASH BUG13907 WIN : LayoutTests/media/video-empty-source.html = FAIL // This test times out in release build, it is really flaky. BUG13907 WIN : LayoutTests/media/video-error-abort.html = PASS FAIL TIMEOUT @@ -2762,3 +2762,8 @@ BUG14014 DEBUG : LayoutTests/fast/events/tabindex-focus-chain.html = FAIL // WebKit 44646:44668 BUG14061 : LayoutTests/svg/filters/subRegion-one-effect.svg = FAIL BUG14061 : LayoutTests/svg/filters/subRegion-two-effects.svg = FAIL + +// WebKit 44682:44699 +// Test expectation changed upstream in +// http://trac.webkit.org/changeset/44695 +BUGMERGE REBASELINE WIN : LayoutTests/fast/frames/viewsource-attribute.html = FAIL |