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

Unified Diff: media/base/demuxer_perftest.cc

Issue 476543004: Implement unit test specific test launcher timeout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: after disabling Created 6 years, 4 months 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
« no previous file with comments | « base/test/test_timeouts.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/demuxer_perftest.cc
diff --git a/media/base/demuxer_perftest.cc b/media/base/demuxer_perftest.cc
index ad6736302f053e4d539229de7102458519d896f3..144b0536a51363686f2d750a64f4b797f869b3a0 100644
--- a/media/base/demuxer_perftest.cc
+++ b/media/base/demuxer_perftest.cc
@@ -207,26 +207,33 @@ static void RunDemuxerBenchmark(const std::string& filename) {
true);
}
-#if defined(OS_WIN)
-// http://crbug.com/399002
-#define MAYBE_Demuxer DISABLED_Demuxer
-#else
-#define MAYBE_Demuxer Demuxer
-#endif
-TEST(DemuxerPerfTest, MAYBE_Demuxer) {
- RunDemuxerBenchmark("bear.ogv");
- RunDemuxerBenchmark("bear-640x360.webm");
- RunDemuxerBenchmark("sfx_s16le.wav");
+class DemuxerPerfTest : public testing::TestWithParam<const char*> {
+};
+
+const char* kDemuxerBenchmarks[] = {
+ "bear.ogv",
+ "bear-640x360.webm",
+ "sfx_s16le.wav",
#if defined(USE_PROPRIETARY_CODECS)
- RunDemuxerBenchmark("bear-1280x720.mp4");
- RunDemuxerBenchmark("sfx.mp3");
+ "bear-1280x720.mp4",
+ "sfx.mp3",
#endif
#if defined(OS_CHROMEOS)
- RunDemuxerBenchmark("bear.flac");
+ "bear.flac",
#endif
#if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS)
- RunDemuxerBenchmark("bear.avi");
+ "bear.avi",
#endif
+};
+
+TEST_P(DemuxerPerfTest, Demuxer) {
+ RunDemuxerBenchmark(GetParam());
}
+#if !defined(OS_WIN)
+// http://crbug.com/399002
+INSTANTIATE_TEST_CASE_P(, DemuxerPerfTest,
+ testing::ValuesIn(kDemuxerBenchmarks));
+#endif // !defined(OS_WIN)
+
} // namespace media
« no previous file with comments | « base/test/test_timeouts.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698