From 53ed5a41a2a1c630ded11272b53334b9a5cd0b34 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Mon, 5 Mar 2012 20:15:58 +0000 Subject: [PATCH] Fix building errors and enable test app TEST=build on all platforms Review URL: https://webrtc-codereview.appspot.com/428008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1841 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/voice_engine/main/test/auto_test/voe_test_defines.h | 3 ++- src/voice_engine/main/test/voice_engine_tests.gypi | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/voice_engine/main/test/auto_test/voe_test_defines.h b/src/voice_engine/main/test/auto_test/voe_test_defines.h index c9c103a33c..9fff35b183 100644 --- a/src/voice_engine/main/test/auto_test/voe_test_defines.h +++ b/src/voice_engine/main/test/auto_test/voe_test_defines.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -21,6 +21,7 @@ __android_log_print(ANDROID_LOG_DEBUG, ANDROID_LOG_TAG, __VA_ARGS__) #define TEST_LOG_ERROR(...) \ __android_log_print(ANDROID_LOG_ERROR, ANDROID_LOG_TAG, __VA_ARGS__) +#define TEST_LOG_FLUSH #else #define TEST_LOG printf #define TEST_LOG_ERROR printf diff --git a/src/voice_engine/main/test/voice_engine_tests.gypi b/src/voice_engine/main/test/voice_engine_tests.gypi index ad78912896..db108babfd 100644 --- a/src/voice_engine/main/test/voice_engine_tests.gypi +++ b/src/voice_engine/main/test/voice_engine_tests.gypi @@ -67,6 +67,14 @@ 'auto_test/voe_unit_test.cc', 'auto_test/voe_unit_test.h', ], + 'conditions': [ + ['OS=="android"', { + # some tests are not supported on android yet, exclude these tests. + 'sources!': [ + 'auto_test/standard/hardware_before_streaming_test.cc', + ], + }], + ], }, { # command line test that should work on linux/mac/win