Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Unified Diff: media/ffmpeg/ffmpeg_regression_tests.cc

Issue 11664013: GTTF: No more FLAKY_ . (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/ffmpeg/ffmpeg_regression_tests.cc
diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc
index ba0d084eb5b1c709266cebc396e8882fe99d46c8..923a610ba27b3a7518a85f8d3a18f6c423a841fc 100644
--- a/media/ffmpeg/ffmpeg_regression_tests.cc
+++ b/media/ffmpeg/ffmpeg_regression_tests.cc
@@ -86,8 +86,8 @@ class FlakyFFmpegRegressionTest
video_md5, \
audio_md5)));
-#define FLAKY_FFMPEG_TEST_CASE(name, fn) \
- INSTANTIATE_TEST_CASE_P(FLAKY_##name, FlakyFFmpegRegressionTest, \
+#define DISABLED_FFMPEG_TEST_CASE(name, fn) \
+ INSTANTIATE_TEST_CASE_P(DISABLED_##name, FlakyFFmpegRegressionTest, \
testing::Values(FlakyRegressionTestData(fn)));
// Test cases from issues.
@@ -304,25 +304,25 @@ FFMPEG_TEST_CASE(BIG_MEM_2, "security/looping1.mov",
FFMPEG_TEST_CASE(BIG_MEM_5, "security/looping5.mov",
DEMUXER_ERROR_COULD_NOT_OPEN, DEMUXER_ERROR_COULD_NOT_OPEN,
kNullHash, kNullHash);
-FLAKY_FFMPEG_TEST_CASE(BIG_MEM_3, "security/looping3.mov");
-FLAKY_FFMPEG_TEST_CASE(BIG_MEM_4, "security/looping4.mov");
+DISABLED_FFMPEG_TEST_CASE(BIG_MEM_3, "security/looping3.mov");
+DISABLED_FFMPEG_TEST_CASE(BIG_MEM_4, "security/looping4.mov");
// Flaky under threading or for other reasons. Per rbultje, most of these will
// never be reliable since FFmpeg does not guarantee consistency in error cases.
// We only really care that these don't cause crashes or errors under tooling.
-FLAKY_FFMPEG_TEST_CASE(Cr99652, "security/99652.webm");
-FLAKY_FFMPEG_TEST_CASE(Cr100464, "security/100464.webm");
-FLAKY_FFMPEG_TEST_CASE(Cr111342, "security/111342.ogm");
-FLAKY_FFMPEG_TEST_CASE(OGV_0, "security/big_dims.ogv");
-FLAKY_FFMPEG_TEST_CASE(OGV_3, "security/smclock_1_0.ogv");
-FLAKY_FFMPEG_TEST_CASE(OGV_4, "security/smclock.ogv.1.0.ogv");
-FLAKY_FFMPEG_TEST_CASE(OGV_6, "security/smclocktheora_1_10000.ogv");
-FLAKY_FFMPEG_TEST_CASE(OGV_13, "security/smclocktheora_1_790.ogv");
-FLAKY_FFMPEG_TEST_CASE(MP4_3, "security/clockh264aac_300413969.mp4");
-FLAKY_FFMPEG_TEST_CASE(MP4_4, "security/clockh264aac_301350139.mp4");
-FLAKY_FFMPEG_TEST_CASE(MP4_12, "security/assert1.mov");
+DISABLED_FFMPEG_TEST_CASE(Cr99652, "security/99652.webm");
+DISABLED_FFMPEG_TEST_CASE(Cr100464, "security/100464.webm");
+DISABLED_FFMPEG_TEST_CASE(Cr111342, "security/111342.ogm");
+DISABLED_FFMPEG_TEST_CASE(OGV_0, "security/big_dims.ogv");
+DISABLED_FFMPEG_TEST_CASE(OGV_3, "security/smclock_1_0.ogv");
+DISABLED_FFMPEG_TEST_CASE(OGV_4, "security/smclock.ogv.1.0.ogv");
+DISABLED_FFMPEG_TEST_CASE(OGV_6, "security/smclocktheora_1_10000.ogv");
+DISABLED_FFMPEG_TEST_CASE(OGV_13, "security/smclocktheora_1_790.ogv");
+DISABLED_FFMPEG_TEST_CASE(MP4_3, "security/clockh264aac_300413969.mp4");
+DISABLED_FFMPEG_TEST_CASE(MP4_4, "security/clockh264aac_301350139.mp4");
+DISABLED_FFMPEG_TEST_CASE(MP4_12, "security/assert1.mov");
// Not really flaky, but can't pass the seek test.
-FLAKY_FFMPEG_TEST_CASE(MP4_10, "security/null1.m4a");
+DISABLED_FFMPEG_TEST_CASE(MP4_10, "security/null1.m4a");
// Videos with massive gaps between frame timestamps that result in long hangs
// with our pipeline. Should be uncommented when we support clockless playback.

Powered by Google App Engine
This is Rietveld 408576698