diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 05:46:05 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 05:46:05 +0000 |
| commit | 34a43dba701101a39624b488a821666643088e35 (patch) | |
| tree | fa121b2339538609e20cfad6e9b2775939e29dc8 /media | |
| parent | cdf00182dc9cecd8cfece0980cf1355eaeb957a5 (diff) | |
| download | chromium_src-34a43dba701101a39624b488a821666643088e35.zip chromium_src-34a43dba701101a39624b488a821666643088e35.tar.gz chromium_src-34a43dba701101a39624b488a821666643088e35.tar.bz2 | |
Disable PipelineImplTest.AudioStream on OS X
BUG=105234
Review URL: http://codereview.chromium.org/8679001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111320 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/pipeline_impl_unittest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc index 07f773d..ebfd26e 100644 --- a/media/base/pipeline_impl_unittest.cc +++ b/media/base/pipeline_impl_unittest.cc @@ -381,7 +381,13 @@ TEST_F(PipelineImplTest, NoStreams) { EXPECT_FALSE(pipeline_->IsInitialized()); } -TEST_F(PipelineImplTest, AudioStream) { +#if defined(OS_MACOSX) +// Crashes on OS X - http://crbug.com/105234 +#define MAYBE_AudioStream DISABLED_AudioStream +#else +#define MAYBE_AudioStream AudioStream +#endif +TEST_F(PipelineImplTest, MAYBE_AudioStream) { CreateAudioStream(); MockDemuxerStreamVector streams; streams.push_back(audio_stream()); |