diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-18 22:06:43 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-18 22:06:43 +0000 |
| commit | 71893bf4539fe2d65cfc3fc2e0f532a31db9f76a (patch) | |
| tree | 25967e4975c4673add7765fab145356a07b0be1f /media/media.gyp | |
| parent | 7c4329e5a84ef883d5e3f116d8cb78a401b92b2b (diff) | |
| download | chromium_src-71893bf4539fe2d65cfc3fc2e0f532a31db9f76a.zip chromium_src-71893bf4539fe2d65cfc3fc2e0f532a31db9f76a.tar.gz chromium_src-71893bf4539fe2d65cfc3fc2e0f532a31db9f76a.tar.bz2 | |
Revert 75444 - Move MockFFmpeg instance setting into the constructor/destructor.
Previously tests had to manually call MockFFmpeg::set() during test setup and teardown. Now that operation is handled automatically via scoping.
BUG=72933
TEST=media_unittests
Review URL: http://codereview.chromium.org/6539021
TBR=scherkus@chromium.org
Review URL: http://codereview.chromium.org/6541037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index 2e6e613..1b76aff 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -399,6 +399,53 @@ }], ], }], + # media_unittests is failing like crazy on Windows. So disable all test + # cases. See bug: http://crbug.com/72790 + ['OS=="win"', { + 'sources!': [ + 'audio/audio_input_controller_unittest.cc', + 'audio/audio_input_unittest.cc', + 'audio/audio_output_controller_unittest.cc', + 'audio/audio_output_proxy_unittest.cc', + 'audio/audio_parameters_unittest.cc', + 'audio/audio_util_unittest.cc', + 'audio/fake_audio_input_stream_unittest.cc', + 'audio/linux/alsa_output_unittest.cc', + 'audio/mac/audio_output_mac_unittest.cc', + 'audio/simple_sources_unittest.cc', + 'audio/win/audio_output_win_unittest.cc', + 'base/composite_filter_unittest.cc', + 'base/clock_impl_unittest.cc', + 'base/data_buffer_unittest.cc', + 'base/djb2_unittest.cc', + 'base/filter_collection_unittest.cc', + 'base/h264_bitstream_converter_unittest.cc', + 'base/mock_ffmpeg.cc', + 'base/mock_ffmpeg.h', + 'base/mock_reader.h', + 'base/mock_task.cc', + 'base/mock_task.h', + 'base/pipeline_impl_unittest.cc', + 'base/pts_heap_unittest.cc', + 'base/seekable_buffer_unittest.cc', + 'base/state_matrix_unittest.cc', + 'base/video_frame_unittest.cc', + 'base/yuv_convert_unittest.cc', + 'filters/audio_renderer_algorithm_ola_unittest.cc', + 'filters/audio_renderer_base_unittest.cc', + 'filters/bitstream_converter_unittest.cc', + 'filters/decoder_base_unittest.cc', + 'filters/ffmpeg_demuxer_unittest.cc', + 'filters/ffmpeg_glue_unittest.cc', + 'filters/ffmpeg_h264_bitstream_converter_unittest.cc', + 'filters/ffmpeg_video_decoder_unittest.cc', + 'filters/file_data_source_unittest.cc', + 'filters/video_renderer_base_unittest.cc', + 'omx/mock_omx.cc', + 'omx/mock_omx.h', + 'video/ffmpeg_video_decode_engine_unittest.cc', + ], + }], ], }, { |