Index: webrtc/modules/audio_coding/neteq/neteq_unittest.cc |
diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc |
index b3d6f25f8910e778c522ce188a8d51a1b90b5cc5..5953353615e1d5c6275f7e35f8425134602e8be0 100644 |
--- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc |
+++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc |
@@ -437,7 +437,12 @@ void NetEqDecodingTest::PopulateCng(int frame_index, |
*payload_len = 1; // Only noise level, no spectral parameters. |
} |
-TEST_F(NetEqDecodingTest, DISABLED_ON_ANDROID(TestBitExactness)) { |
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) |
tkchin
2015/06/09 17:50:23
Add bug / TODO here too? (just so we don't lose tr
henrika_webrtc
2015/06/10 08:48:48
Used a nested DISABLED_ON macro here instead. My p
|
+#define MAYBE_TestBitExactness DISABLED_TestBitExactness |
+#else |
+#define MAYBE_TestBitExactness TestBitExactness |
+#endif |
+TEST_F(NetEqDecodingTest, MAYBE_TestBitExactness) { |
const std::string input_rtp_file = webrtc::test::ProjectRootPath() + |
"resources/audio_coding/neteq_universal_new.rtp"; |
// Note that neteq4_universal_ref.pcm and neteq4_universal_ref_win_32.pcm |
@@ -1052,19 +1057,19 @@ class NetEqBgnTestFade : public NetEqBgnTest { |
} |
}; |
-TEST_F(NetEqBgnTestOn, RunTest) { |
+TEST_F(NetEqBgnTestOn, DISABLED_ON_IOS(RunTest)) { |
CheckBgn(8000); |
CheckBgn(16000); |
CheckBgn(32000); |
} |
-TEST_F(NetEqBgnTestOff, RunTest) { |
+TEST_F(NetEqBgnTestOff, DISABLED_ON_IOS(RunTest)) { |
CheckBgn(8000); |
CheckBgn(16000); |
CheckBgn(32000); |
} |
-TEST_F(NetEqBgnTestFade, RunTest) { |
+TEST_F(NetEqBgnTestFade, DISABLED_ON_IOS(RunTest)) { |
CheckBgn(8000); |
CheckBgn(16000); |
CheckBgn(32000); |