diff options
| author | phajdan.jr <phajdan.jr@chromium.org> | 2014-08-25 08:11:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-25 15:12:26 +0000 |
| commit | 5f0e5ec083265bb2f34baf50d36569729752b6a3 (patch) | |
| tree | 845b6da41f4608b0d5058c2fffce644e08d1e1b8 /media/base | |
| parent | 7f590bcff76926fc8442e020dcd1eebf604bf129 (diff) | |
| download | chromium_src-5f0e5ec083265bb2f34baf50d36569729752b6a3.zip chromium_src-5f0e5ec083265bb2f34baf50d36569729752b6a3.tar.gz chromium_src-5f0e5ec083265bb2f34baf50d36569729752b6a3.tar.bz2 | |
Revert of Implement unit test specific test launcher timeout (patchset #6 of https://codereview.chromium.org/476543004/)
Reason for revert:
Multiple tests are timing out on dbg bots.
Original issue's description:
> Implement unit test specific test launcher timeout
>
> BUG=402213
TBR=jam@chromium.org,dalecurtis@chromium.org,rileya@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=402213
Review URL: https://codereview.chromium.org/504813003
Cr-Commit-Position: refs/heads/master@{#291682}
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/demuxer_perftest.cc | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/media/base/demuxer_perftest.cc b/media/base/demuxer_perftest.cc index 144b053..ad67363 100644 --- a/media/base/demuxer_perftest.cc +++ b/media/base/demuxer_perftest.cc @@ -207,33 +207,26 @@ static void RunDemuxerBenchmark(const std::string& filename) { true); } -class DemuxerPerfTest : public testing::TestWithParam<const char*> { -}; - -const char* kDemuxerBenchmarks[] = { - "bear.ogv", - "bear-640x360.webm", - "sfx_s16le.wav", +#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"); #if defined(USE_PROPRIETARY_CODECS) - "bear-1280x720.mp4", - "sfx.mp3", + RunDemuxerBenchmark("bear-1280x720.mp4"); + RunDemuxerBenchmark("sfx.mp3"); #endif #if defined(OS_CHROMEOS) - "bear.flac", + RunDemuxerBenchmark("bear.flac"); #endif #if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS) - "bear.avi", + RunDemuxerBenchmark("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 |