Disables some modules_unittests on Android.

BUG=3445
R=henrik.lundin@webrtc.org, kwiberg@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6325 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
bjornv@webrtc.org 2014-06-04 12:12:58 +00:00
parent 4436b4436a
commit b616e1211f
3 changed files with 8 additions and 6 deletions

View File

@ -9,12 +9,12 @@
*/ */
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
extern "C" { extern "C" {
#include "webrtc/modules/audio_processing/aec/aec_core.h" #include "webrtc/modules/audio_processing/aec/aec_core.h"
} }
#include "webrtc/modules/audio_processing/aec/echo_cancellation_internal.h" #include "webrtc/modules/audio_processing/aec/echo_cancellation_internal.h"
#include "webrtc/modules/audio_processing/aec/include/echo_cancellation.h" #include "webrtc/modules/audio_processing/aec/include/echo_cancellation.h"
#include "webrtc/test/testsupport/gtest_disable.h"
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
namespace { namespace {
@ -248,7 +248,8 @@ TEST_F(SystemDelayTest, CorrectDelayAfterUnstableStartup) {
} }
} }
TEST_F(SystemDelayTest, CorrectDelayAfterStableBufferBuildUp) { TEST_F(SystemDelayTest,
DISABLED_ON_ANDROID(CorrectDelayAfterStableBufferBuildUp)) {
// In this test we start by establishing the device buffer size during stable // In this test we start by establishing the device buffer size during stable
// conditions, but with an empty internal far-end buffer. Once that is done we // conditions, but with an empty internal far-end buffer. Once that is done we
// verify that the system delay is increased correctly until we have reach an // verify that the system delay is increased correctly until we have reach an
@ -329,7 +330,7 @@ TEST_F(SystemDelayTest, CorrectDelayWhenBufferUnderrun) {
} }
} }
TEST_F(SystemDelayTest, CorrectDelayDuringDrift) { TEST_F(SystemDelayTest, DISABLED_ON_ANDROID(CorrectDelayDuringDrift)) {
// This drift test should verify that the system delay is never exceeding the // This drift test should verify that the system delay is never exceeding the
// device buffer. The drift is simulated by decreasing the reported device // device buffer. The drift is simulated by decreasing the reported device
// buffer size by 1 ms every 100 ms. If the device buffer size goes below 30 // buffer size by 1 ms every 100 ms. If the device buffer size goes below 30

View File

@ -14,10 +14,11 @@ extern "C" {
} }
#include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/testsupport/gtest_disable.h"
namespace webrtc { namespace webrtc {
TEST(EchoCancellationInternalTest, DelayCorrection) { TEST(EchoCancellationInternalTest, DISABLED_ON_ANDROID(DelayCorrection)) {
scoped_ptr<AudioProcessing> ap(AudioProcessing::Create(0)); scoped_ptr<AudioProcessing> ap(AudioProcessing::Create(0));
EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL); EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL);

View File

@ -827,7 +827,7 @@ TEST_F(ApmTest, EchoCancellation) {
EXPECT_FALSE(apm_->echo_cancellation()->aec_core() != NULL); EXPECT_FALSE(apm_->echo_cancellation()->aec_core() != NULL);
} }
TEST_F(ApmTest, EchoCancellationReportsCorrectDelays) { TEST_F(ApmTest, DISABLED_ON_ANDROID(EchoCancellationReportsCorrectDelays)) {
// Enable AEC only. // Enable AEC only.
EXPECT_EQ(apm_->kNoError, EXPECT_EQ(apm_->kNoError,
apm_->echo_cancellation()->enable_drift_compensation(false)); apm_->echo_cancellation()->enable_drift_compensation(false));
@ -1369,7 +1369,7 @@ TEST_F(ApmTest, IdenticalInputChannelsResultInIdenticalOutputChannels) {
} }
} }
TEST_F(ApmTest, SplittingFilter) { TEST_F(ApmTest, DISABLED_ON_ANDROID(SplittingFilter)) {
// Verify the filter is not active through undistorted audio when: // Verify the filter is not active through undistorted audio when:
// 1. No components are enabled... // 1. No components are enabled...
SetFrameTo(frame_, 1000); SetFrameTo(frame_, 1000);