Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(321)

Unified Diff: webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc

Issue 1171033002: Ensures that modules_unittests runs on iOS (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebased Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc
diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc
index 80ce082be55f7c669b4f71465091441904b0125a..e5fcee3cc4651ad63f59b2e44815e38a9f757feb 100644
--- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc
+++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc
@@ -503,10 +503,20 @@ class AcmIsacMtTest : public AudioCodingModuleMtTest {
test::AudioLoop audio_loop_;
};
-TEST_F(AcmIsacMtTest, DoTest) {
+#if defined(WEBRTC_IOS)
+// See https://code.google.com/p/webrtc/issues/detail?id=4752 for details.
+#define MAYBE_DoTest DISABLED_DoTest
+#else
+#define MAYBE_DoTest DoTest
+#endif
+TEST_F(AcmIsacMtTest, MAYBE_DoTest) {
EXPECT_EQ(kEventSignaled, RunTest());
}
+// Disabling all of these tests on iOS until file support has been added.
+// See https://code.google.com/p/webrtc/issues/detail?id=4752 for details.
+#if !defined(WEBRTC_IOS)
+
class AcmReceiverBitExactness : public ::testing::Test {
public:
static std::string PlatformChecksum(std::string win64,
@@ -963,4 +973,6 @@ TEST_F(AcmSenderBitExactness, MAYBE_Opus_stereo_20ms) {
test::AcmReceiveTest::kStereoOutput);
}
+#endif
+
} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698