| Index: webrtc/voice_engine/test/auto_test/voe_test_defines.h
|
| diff --git a/webrtc/voice_engine/test/auto_test/voe_test_defines.h b/webrtc/voice_engine/test/auto_test/voe_test_defines.h
|
| index 7f823ecbd1c8b9165a5289d55fccbd6ae96afb0f..c08fb49393cc1ebb5b77cca7b16b28b07481a0e9 100644
|
| --- a/webrtc/voice_engine/test/auto_test/voe_test_defines.h
|
| +++ b/webrtc/voice_engine/test/auto_test/voe_test_defines.h
|
| @@ -16,34 +16,6 @@
|
| // Read WEBRTC_VOICE_ENGINE_XXX_API compiler flags
|
| #include "webrtc/voice_engine_configurations.h"
|
|
|
| -#ifndef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
|
| -#error "Deprecated"
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_CODEC_API
|
| -#error "Deprecated"
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
|
| -#error "Deprecated"
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_FILE_API
|
| -#error "Deprecated"
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_HARDWARE_API
|
| -#error "Deprecated"
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
|
| -#error "Deprecated"
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
|
| -#error "Deprecated"
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
|
| -#error "Deprecated"
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API
|
| -#error "Deprecated"
|
| -#endif
|
| -
|
| // Select the tests to execute, list order below is same as they will be
|
| // executed. Note that, all settings below will be overriden by sub-API
|
| // settings in voice_engine_configurations.h.
|
| @@ -71,36 +43,6 @@
|
| // that will not pass due to slowed down execution.
|
| // #define _INSTRUMENTATION_TESTING_
|
|
|
| -// Exclude (override) API tests given preprocessor settings in
|
| -// engine_configurations.h
|
| -#ifndef WEBRTC_VOICE_ENGINE_CODEC_API
|
| -#undef _TEST_CODEC_
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API
|
| -#undef _TEST_VOLUME_
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
|
| -#undef _TEST_RTP_RTCP_
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
|
| -#undef _TEST_AUDIO_PROCESSING_
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_FILE_API
|
| -#undef _TEST_FILE_
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
|
| -#undef _TEST_VIDEO_SYNC_
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_HARDWARE_API
|
| -#undef _TEST_HARDWARE_
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
|
| -#undef _TEST_XMEDIA_
|
| -#endif
|
| -#ifndef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
|
| -#undef _TEST_NETEQ_STATS_
|
| -#endif
|
| -
|
| // Some parts can cause problems while running Insure
|
| #ifdef __INSURE__
|
| #define _INSTRUMENTATION_TESTING_
|
|
|