diff options
Diffstat (limited to 'webrtc/modules/utility/source/file_player_unittests.cc')
| -rw-r--r-- | webrtc/modules/utility/source/file_player_unittests.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/webrtc/modules/utility/source/file_player_unittests.cc b/webrtc/modules/utility/source/file_player_unittests.cc index 4b65acdeef..58471e5e8d 100644 --- a/webrtc/modules/utility/source/file_player_unittests.cc +++ b/webrtc/modules/utility/source/file_player_unittests.cc @@ -10,7 +10,7 @@ // Unit tests for FilePlayer. -#include "webrtc/modules/utility/interface/file_player.h" +#include "webrtc/modules/utility/include/file_player.h" #include <stdio.h> #include <string> @@ -20,7 +20,6 @@ #include "webrtc/base/md5digest.h" #include "webrtc/base/stringencode.h" #include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/testsupport/gtest_disable.h" DEFINE_bool(file_player_output, false, "Generate reference files."); @@ -82,7 +81,12 @@ class FilePlayerTest : public ::testing::Test { FILE* output_file_; }; -TEST_F(FilePlayerTest, DISABLED_ON_IOS(PlayWavPcmuFile)) { +#if defined(WEBRTC_IOS) +#define MAYBE_PlayWavPcmuFile DISABLED_PlayWavPcmuFile +#else +#define MAYBE_PlayWavPcmuFile PlayWavPcmuFile +#endif +TEST_F(FilePlayerTest, MAYBE_PlayWavPcmuFile) { const std::string kFileName = test::ResourcePath("utility/encapsulated_pcmu_8khz", "wav"); // The file is longer than this, but keeping the output shorter limits the @@ -93,7 +97,12 @@ TEST_F(FilePlayerTest, DISABLED_ON_IOS(PlayWavPcmuFile)) { PlayFileAndCheck(kFileName, kRefChecksum, kOutputLengthMs); } -TEST_F(FilePlayerTest, DISABLED_ON_IOS(PlayWavPcm16File)) { +#if defined(WEBRTC_IOS) +#define MAYBE_PlayWavPcm16File DISABLED_PlayWavPcm16File +#else +#define MAYBE_PlayWavPcm16File PlayWavPcm16File +#endif +TEST_F(FilePlayerTest, MAYBE_PlayWavPcm16File) { const std::string kFileName = test::ResourcePath("utility/encapsulated_pcm16b_8khz", "wav"); // The file is longer than this, but keeping the output shorter limits the |