diff options
| author | phoglund@webrtc.org <phoglund@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-09 16:53:42 +0000 |
|---|---|---|
| committer | phoglund@webrtc.org <phoglund@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-09 16:53:42 +0000 |
| commit | b790741419ee844ae75d0abed27b8e4f0f0f1598 (patch) | |
| tree | 2f0a40ad01b7874e0c62ae012d5dbc6857d18226 /voice_engine | |
| parent | 8e9767d9395e565a363fbe30b2bcea596f8df36c (diff) | |
| download | webrtc-b790741419ee844ae75d0abed27b8e4f0f0f1598.tar.gz | |
Generalized mechanism for excluding gtests on platforms, disabled broken tests on mac.
BUG=1268
TEST=vie_auto_test on mac and linux
TBR=mflodman, kjellander
Review URL: https://webrtc-codereview.appspot.com/1027006
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3347 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine')
| -rw-r--r-- | voice_engine/test/auto_test/fixtures/before_initialization_fixture.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h b/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h index c65ea6a3..77d83056 100644 --- a/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h +++ b/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h @@ -15,6 +15,7 @@ #include "common_types.h" #include "engine_configurations.h" +#include "test/testsupport/gtest_disable.h" #include "voice_engine/include/voe_audio_processing.h" #include "voice_engine/include/voe_base.h" #include "voice_engine/include/voe_call_report.h" @@ -39,25 +40,6 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" -// Helper macros for platform disables. These can be chained. -#ifdef WEBRTC_LINUX -#define DISABLED_ON_LINUX(test) DISABLED_##test -#else -#define DISABLED_ON_LINUX(test) test -#endif - -#ifdef WEBRTC_MAC -#define DISABLED_ON_MAC(test) DISABLED_##test -#else -#define DISABLED_ON_MAC(test) test -#endif - -#ifdef _WIN32 -#define DISABLED_ON_WIN(test) DISABLED_##test -#else -#define DISABLED_ON_WIN(test) test -#endif - // This convenient fixture sets up all voice engine interfaces automatically for // use by testing subclasses. It allocates each interface and releases it once // which means that if a tests allocates additional interfaces from the voice |