| Index: webrtc/modules/media_file/media_file_unittest.cc
|
| diff --git a/webrtc/modules/media_file/media_file_unittest.cc b/webrtc/modules/media_file/media_file_unittest.cc
|
| index c12ea57ea2909c05424ef473682ab2284ff99f0b..917d9244e0c1f551eb2140be6c8b673815c9ca4a 100644
|
| --- a/webrtc/modules/media_file/media_file_unittest.cc
|
| +++ b/webrtc/modules/media_file/media_file_unittest.cc
|
| @@ -12,7 +12,6 @@
|
| #include "webrtc/modules/media_file/media_file.h"
|
| #include "webrtc/system_wrappers/include/sleep.h"
|
| #include "webrtc/test/testsupport/fileutils.h"
|
| -#include "webrtc/test/testsupport/gtest_disable.h"
|
|
|
| class MediaFileTest : public testing::Test {
|
| protected:
|
| @@ -28,8 +27,11 @@ class MediaFileTest : public testing::Test {
|
| webrtc::MediaFile* media_file_;
|
| };
|
|
|
| -TEST_F(MediaFileTest, DISABLED_ON_IOS(
|
| - DISABLED_ON_ANDROID(StartPlayingAudioFileWithoutError))) {
|
| +#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
|
| +TEST_F(MediaFileTest, DISABLED_StartPlayingAudioFileWithoutError) {
|
| +#else
|
| +TEST_F(MediaFileTest, StartPlayingAudioFileWithoutError) {
|
| +#endif
|
| // TODO(leozwang): Use hard coded filename here, we want to
|
| // loop through all audio files in future
|
| const std::string audio_file = webrtc::test::ProjectRootPath() +
|
| @@ -47,7 +49,11 @@ TEST_F(MediaFileTest, DISABLED_ON_IOS(
|
| ASSERT_EQ(0, media_file_->StopPlaying());
|
| }
|
|
|
| -TEST_F(MediaFileTest, DISABLED_ON_IOS(WriteWavFile)) {
|
| +#if defined(WEBRTC_IOS)
|
| +TEST_F(MediaFileTest, DISABLED_WriteWavFile) {
|
| +#else
|
| +TEST_F(MediaFileTest, WriteWavFile) {
|
| +#endif
|
| // Write file.
|
| static const size_t kHeaderSize = 44;
|
| static const size_t kPayloadSize = 320;
|
|
|