summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-12 03:00:14 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-12 03:00:14 +0000
commit05a5366a761d41507e5b4bf2f610139d39a14257 (patch)
tree6724d7e5736d17870b7b9794aa39ff9db48b1a33
parent12dae7dbf7f97127a6ed8ae98001730aa85859ba (diff)
downloadchromium_src-05a5366a761d41507e5b4bf2f610139d39a14257.zip
chromium_src-05a5366a761d41507e5b4bf2f610139d39a14257.tar.gz
chromium_src-05a5366a761d41507e5b4bf2f610139d39a14257.tar.bz2
webkit failures after ffmpeg will need rebase line. disabling 4 tests for now.
BUG=35492 TEST=webkit layout tests should pass. Review URL: http://codereview.chromium.org/593077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38871 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt23
1 files changed, 15 insertions, 8 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index c659a6b..02aa76c 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -740,16 +740,8 @@ BUG13907 BUG25094 LINUX DEBUG : media = PASS FAIL TIMEOUT
// These tests should be passing. Remove them once confirmed they're not flaky.
BUG9798 BUG13907 : media/video-currentTime-set.html = PASS FAIL
-BUG9798 BUG13907 WIN DEBUG : media/controls-drag-timebar.html = TEXT TIMEOUT
-BUG9798 BUG13907 RELEASE : media/controls-drag-timebar.html = TEXT
-BUG9798 BUG13907 LINUX MAC DEBUG : media/controls-drag-timebar.html = TEXT
BUG9798 BUG13907 SLOW WIN : media/video-played-collapse.html = PASS FAIL
BUG9798 BUG13907 SLOW LINUX MAC : media/video-played-collapse.html = PASS
-BUG9798 BUG13907 SLOW DEBUG : media/video-played-ranges-1.html = PASS
-BUG9798 BUG13907 SLOW LINUX MAC RELEASE : media/video-played-ranges-1.html = PASS
-BUG9798 BUG13907 SLOW WIN RELEASE : media/video-played-ranges-1.html = PASS FAIL
-BUG9798 BUG13907 SLOW MAC WIN RELEASE : media/video-played-reset.html = PASS
-BUG9798 BUG13907 SLOW LINUX DEBUG : media/video-played-reset.html = PASS
// We output an extra playing event and video durations are different.
BUG13907 SKIP : media/video-loop.html = FAIL
@@ -2923,3 +2915,18 @@ BUG35237 : fast/events/multiline-link-arrow-navigation.html = TEXT
// WebKit roll 54596:54648
BUG35387 : platform/win/plugins/plugin-delayed-destroy.html = TIMEOUT
+
+// FFmpeg roll breaks these
+BUG35492 : media/video-played-ranges-1.html = FAIL
+BUG35492 : media/video-played-reset.html = FAIL
+BUG35492 : media/video-display-toggle.html = FAIL
+BUG35492 : media/controls-drag-timebar.html = FAIL
+// Previous to FFmpeg roll expectations
+//BUG9798 BUG13907 SLOW LINUX MAC RELEASE : media/video-played-ranges-1.html = FAIL
+//BUG9798 BUG13907 SLOW WIN RELEASE : media/video-played-ranges-1.html = FAIL
+//BUG9798 BUG13907 WIN DEBUG : media/controls-drag-timebar.html = TEXT TIMEOUT
+//BUG9798 BUG13907 RELEASE : media/controls-drag-timebar.html = TEXT
+//BUG9798 BUG13907 LINUX MAC DEBUG : media/controls-drag-timebar.html = TEXT
+//BUG9798 BUG13907 SLOW WIN RELEASE : media/video-played-ranges-1.html = PASS FAIL
+//BUG9798 BUG13907 SLOW MAC WIN RELEASE : media/video-played-reset.html = PASS
+//BUG9798 BUG13907 SLOW LINUX DEBUG : media/video-played-reset.html = PASS