commit 056287eee09b82181f3270c38f72f833fd3d7acc
author tina.legrand@webrtc.org <tina.legrand@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Feb 19 13:45:54 2014 +0000
committer tina.legrand@webrtc.org <tina.legrand@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Feb 19 13:45:54 2014 +0000
tree fff680b037b53f3ddf7b6f00223dcec56c4bde93
parent 8098e0747879b191335e8de1e16b87cf6adbdf54

This CL separate all ACM tests with new and old implementation of ACM and NetEq. The reason is to debug an issue with failure on Android try bots. We need to see if the error only occurs with the new ACM/NetEq, or if it is a flakiness that affects both.

BUG=issue2874
R=minyue@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8829004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5576 4adac7df-926f-26a2-2b94-8c16560cd09d

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 31f7317..0307235 100644
--- a/webrtc/modules/audio_coding/main/test/Tester.cc
+++ b/webrtc/modules/audio_coding/main/test/Tester.cc
@@ -43,10 +43,17 @@
 
   UseLegacyAcm(&config);
   webrtc::TestAllCodecs(ACM_TEST_MODE, config).Perform();
+  Trace::ReturnTrace();
+}
+
+TEST(AudioCodingModuleTest, TestAllCodecsNewACM) {
+  Trace::CreateTrace();
+  Trace::SetTraceFile((webrtc::test::OutputPath() +
+          "acm_allcodecs_trace_new.txt").c_str());
+  webrtc::Config config;
 
   UseNewAcm(&config);
   webrtc::TestAllCodecs(ACM_TEST_MODE, config).Perform();
-
   Trace::ReturnTrace();
 }
 
@@ -58,10 +65,17 @@
 
   UseLegacyAcm(&config);
   webrtc::EncodeDecodeTest(ACM_TEST_MODE, config).Perform();
+  Trace::ReturnTrace();
+}
+
+TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestEncodeDecodeNewACM)) {
+  Trace::CreateTrace();
+  Trace::SetTraceFile((webrtc::test::OutputPath() +
+      "acm_encodedecode_trace_new.txt").c_str());
+  webrtc::Config config;
 
   UseNewAcm(&config);
   webrtc::EncodeDecodeTest(ACM_TEST_MODE, config).Perform();
-
   Trace::ReturnTrace();
 }
 
@@ -73,10 +87,17 @@
 
   UseLegacyAcm(&config);
   webrtc::TestFEC(config).Perform();
+  Trace::ReturnTrace();
+}
+
+TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestFECNewACM)) {
+  Trace::CreateTrace();
+  Trace::SetTraceFile((webrtc::test::OutputPath() +
+      "acm_fec_trace_new.txt").c_str());
+  webrtc::Config config;
 
   UseNewAcm(&config);
   webrtc::TestFEC(config).Perform();
-
   Trace::ReturnTrace();
 }
 
@@ -88,10 +109,17 @@
 
   UseLegacyAcm(&config);
   webrtc::ISACTest(ACM_TEST_MODE, config).Perform();
+  Trace::ReturnTrace();
+}
+
+TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestIsacNewACM)) {
+  Trace::CreateTrace();
+  Trace::SetTraceFile((webrtc::test::OutputPath() +
+      "acm_isac_trace_new.txt").c_str());
+  webrtc::Config config;
 
   UseNewAcm(&config);
   webrtc::ISACTest(ACM_TEST_MODE, config).Perform();
-
   Trace::ReturnTrace();
 }
 
@@ -103,10 +131,17 @@
 
   UseLegacyAcm(&config);
   webrtc::TwoWayCommunication(ACM_TEST_MODE, config).Perform();
+  Trace::ReturnTrace();
+}
+
+TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TwoWayCommunicationNewACM)) {
+  Trace::CreateTrace();
+  Trace::SetTraceFile((webrtc::test::OutputPath() +
+      "acm_twowaycom_trace_new.txt").c_str());
+  webrtc::Config config;
 
   UseNewAcm(&config);
   webrtc::TwoWayCommunication(ACM_TEST_MODE, config).Perform();
-
   Trace::ReturnTrace();
 }
 
@@ -114,13 +149,20 @@
   Trace::CreateTrace();
   Trace::SetTraceFile((webrtc::test::OutputPath() +
       "acm_stereo_trace.txt").c_str());
-
   webrtc::Config config;
+
   UseLegacyAcm(&config);
-
   webrtc::TestStereo(ACM_TEST_MODE, config).Perform();
-  UseNewAcm(&config);
+  Trace::ReturnTrace();
+}
 
+TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestStereoNewACM)) {
+  Trace::CreateTrace();
+  Trace::SetTraceFile((webrtc::test::OutputPath() +
+      "acm_stereo_trace_new.txt").c_str());
+  webrtc::Config config;
+
+  UseNewAcm(&config);
   webrtc::TestStereo(ACM_TEST_MODE, config).Perform();
   Trace::ReturnTrace();
 }
@@ -133,10 +175,17 @@
 
   UseLegacyAcm(&config);
   webrtc::TestVADDTX(config).Perform();
+  Trace::ReturnTrace();
+}
+
+TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestVADDTXNewACM)) {
+  Trace::CreateTrace();
+  Trace::SetTraceFile((webrtc::test::OutputPath() +
+      "acm_vaddtx_trace_new.txt").c_str());
+  webrtc::Config config;
 
   UseNewAcm(&config);
   webrtc::TestVADDTX(config).Perform();
-
   Trace::ReturnTrace();
 }
 
@@ -148,10 +197,17 @@
 
   UseLegacyAcm(&config);
   webrtc::OpusTest(config).Perform();
+  Trace::ReturnTrace();
+}
+
+TEST(AudioCodingModuleTest, TestOpusNewACM) {
+  Trace::CreateTrace();
+  Trace::SetTraceFile((webrtc::test::OutputPath() +
+      "acm_opus_trace_new.txt").c_str());
+  webrtc::Config config;
 
   UseNewAcm(&config);
   webrtc::OpusTest(config).Perform();
-
   Trace::ReturnTrace();
 }