Index: webrtc/modules/audio_coding/main/test/Tester.cc |
diff --git a/webrtc/modules/audio_coding/main/test/Tester.cc b/webrtc/modules/audio_coding/main/test/Tester.cc |
index 22510f34161cbf53d4ed26bf2f5b0fe5d7fab985..b6850fabba255865aef715a4b05dedb7e21b3068 100644 |
--- a/webrtc/modules/audio_coding/main/test/Tester.cc |
+++ b/webrtc/modules/audio_coding/main/test/Tester.cc |
@@ -50,7 +50,13 @@ TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestEncodeDecode)) { |
Trace::ReturnTrace(); |
} |
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestRedFec)) { |
+#ifdef WEBRTC_CODEC_RED |
+#define IF_RED(x) x |
+#else |
+#define IF_RED(x) DISABLED_##x |
+#endif |
+ |
+TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(IF_RED(TestRedFec))) { |
Trace::CreateTrace(); |
Trace::SetTraceFile((webrtc::test::OutputPath() + |
"acm_fec_trace.txt").c_str()); |
@@ -58,7 +64,13 @@ TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestRedFec)) { |
Trace::ReturnTrace(); |
} |
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestIsac)) { |
+#if defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX) |
+#define IF_ISAC(x) x |
+#else |
+#define IF_ISAC(x) DISABLED_##x |
+#endif |
+ |
+TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(IF_ISAC(TestIsac))) { |
Trace::CreateTrace(); |
Trace::SetTraceFile((webrtc::test::OutputPath() + |
"acm_isac_trace.txt").c_str()); |
@@ -66,7 +78,15 @@ TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestIsac)) { |
Trace::ReturnTrace(); |
} |
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TwoWayCommunication)) { |
+#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) && \ |
+ defined(WEBRTC_CODEC_ILBC) && defined(WEBRTC_CODEC_G722) |
+#define IF_ALL_CODECS(x) x |
+#else |
+#define IF_ALL_CODECS(x) DISABLED_##x |
+#endif |
+ |
+TEST(AudioCodingModuleTest, |
+ DISABLED_ON_ANDROID(IF_ALL_CODECS(TwoWayCommunication))) { |
Trace::CreateTrace(); |
Trace::SetTraceFile((webrtc::test::OutputPath() + |
"acm_twowaycom_trace.txt").c_str()); |