Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1063)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/voice_engine/voice_engine.gyp

Issue 1457053003: Remove build_with_libjingle and exclude failing iOS tests from 'All' target. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed modules_unittests for iOS simulator builds Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/modules/modules.gyp ('K') | « webrtc/modules/video_render/video_render.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voice_engine.gyp
diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp
index 265ad01992841ab96eb644b1d4d7903592827e8b..570d68062d94574296c19d81eb35205f857d6e2f 100644
--- a/webrtc/voice_engine/voice_engine.gyp
+++ b/webrtc/voice_engine/voice_engine.gyp
@@ -146,85 +146,6 @@
],
},
{
- 'target_name': 'voe_auto_test',
- 'type': 'executable',
- 'dependencies': [
- 'voice_engine',
- '<(DEPTH)/testing/gmock.gyp:gmock',
- '<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
- '<(webrtc_root)/test/test.gyp:channel_transport',
- '<(webrtc_root)/test/test.gyp:test_support',
- '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common',
- '<(webrtc_root)/webrtc.gyp:rtc_event_log',
- ],
- 'sources': [
- 'test/auto_test/automated_mode.cc',
- 'test/auto_test/extended/agc_config_test.cc',
- 'test/auto_test/extended/ec_metrics_test.cc',
- 'test/auto_test/fakes/conference_transport.cc',
- 'test/auto_test/fakes/conference_transport.h',
- 'test/auto_test/fakes/loudest_filter.cc',
- 'test/auto_test/fakes/loudest_filter.h',
- 'test/auto_test/fixtures/after_initialization_fixture.cc',
- 'test/auto_test/fixtures/after_initialization_fixture.h',
- 'test/auto_test/fixtures/after_streaming_fixture.cc',
- 'test/auto_test/fixtures/after_streaming_fixture.h',
- 'test/auto_test/fixtures/before_initialization_fixture.cc',
- 'test/auto_test/fixtures/before_initialization_fixture.h',
- 'test/auto_test/fixtures/before_streaming_fixture.cc',
- 'test/auto_test/fixtures/before_streaming_fixture.h',
- 'test/auto_test/standard/audio_processing_test.cc',
- 'test/auto_test/standard/codec_before_streaming_test.cc',
- 'test/auto_test/standard/codec_test.cc',
- 'test/auto_test/standard/dtmf_test.cc',
- 'test/auto_test/standard/external_media_test.cc',
- 'test/auto_test/standard/file_before_streaming_test.cc',
- 'test/auto_test/standard/file_test.cc',
- 'test/auto_test/standard/hardware_before_initializing_test.cc',
- 'test/auto_test/standard/hardware_before_streaming_test.cc',
- 'test/auto_test/standard/hardware_test.cc',
- 'test/auto_test/standard/mixing_test.cc',
- 'test/auto_test/standard/neteq_stats_test.cc',
- 'test/auto_test/standard/rtp_rtcp_before_streaming_test.cc',
- 'test/auto_test/standard/rtp_rtcp_extensions.cc',
- 'test/auto_test/standard/rtp_rtcp_test.cc',
- 'test/auto_test/standard/voe_base_misc_test.cc',
- 'test/auto_test/standard/video_sync_test.cc',
- 'test/auto_test/standard/volume_test.cc',
- 'test/auto_test/resource_manager.cc',
- 'test/auto_test/voe_conference_test.cc',
- 'test/auto_test/voe_cpu_test.cc',
- 'test/auto_test/voe_cpu_test.h',
- 'test/auto_test/voe_output_test.cc',
- 'test/auto_test/voe_standard_test.cc',
- 'test/auto_test/voe_standard_test.h',
- 'test/auto_test/voe_stress_test.cc',
- 'test/auto_test/voe_stress_test.h',
- 'test/auto_test/voe_test_defines.h',
- 'test/auto_test/voe_test_interface.h',
- ],
- 'conditions': [
- ['OS=="android"', {
- # some tests are not supported on android yet, exclude these tests.
- 'sources!': [
- 'test/auto_test/standard/hardware_before_streaming_test.cc',
- ],
- }],
- ['enable_protobuf==1', {
- 'defines': [
- 'ENABLE_RTC_EVENT_LOG',
- ],
- }],
- ],
- # Disable warnings to enable Win64 build, issue 1323.
- 'msvs_disabled_warnings': [
- 4267, # size_t to int truncation.
- ],
- },
- {
# command line test that should work on linux/mac/win
'target_name': 'voe_cmd_test',
'type': 'executable',
@@ -244,6 +165,89 @@
},
], # targets
'conditions': [
+ ['OS!="ios"', {
+ 'targets': [
+ {
+ 'target_name': 'voe_auto_test',
+ 'type': 'executable',
+ 'dependencies': [
+ 'voice_engine',
+ '<(DEPTH)/testing/gmock.gyp:gmock',
+ '<(DEPTH)/testing/gtest.gyp:gtest',
+ '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
+ '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
+ '<(webrtc_root)/test/test.gyp:channel_transport',
+ '<(webrtc_root)/test/test.gyp:test_support',
+ '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common',
+ '<(webrtc_root)/webrtc.gyp:rtc_event_log',
+ ],
+ 'sources': [
+ 'test/auto_test/automated_mode.cc',
+ 'test/auto_test/extended/agc_config_test.cc',
+ 'test/auto_test/extended/ec_metrics_test.cc',
+ 'test/auto_test/fakes/conference_transport.cc',
+ 'test/auto_test/fakes/conference_transport.h',
+ 'test/auto_test/fakes/loudest_filter.cc',
+ 'test/auto_test/fakes/loudest_filter.h',
+ 'test/auto_test/fixtures/after_initialization_fixture.cc',
+ 'test/auto_test/fixtures/after_initialization_fixture.h',
+ 'test/auto_test/fixtures/after_streaming_fixture.cc',
+ 'test/auto_test/fixtures/after_streaming_fixture.h',
+ 'test/auto_test/fixtures/before_initialization_fixture.cc',
+ 'test/auto_test/fixtures/before_initialization_fixture.h',
+ 'test/auto_test/fixtures/before_streaming_fixture.cc',
+ 'test/auto_test/fixtures/before_streaming_fixture.h',
+ 'test/auto_test/standard/audio_processing_test.cc',
+ 'test/auto_test/standard/codec_before_streaming_test.cc',
+ 'test/auto_test/standard/codec_test.cc',
+ 'test/auto_test/standard/dtmf_test.cc',
+ 'test/auto_test/standard/external_media_test.cc',
+ 'test/auto_test/standard/file_before_streaming_test.cc',
+ 'test/auto_test/standard/file_test.cc',
+ 'test/auto_test/standard/hardware_before_initializing_test.cc',
+ 'test/auto_test/standard/hardware_before_streaming_test.cc',
+ 'test/auto_test/standard/hardware_test.cc',
+ 'test/auto_test/standard/mixing_test.cc',
+ 'test/auto_test/standard/neteq_stats_test.cc',
+ 'test/auto_test/standard/rtp_rtcp_before_streaming_test.cc',
+ 'test/auto_test/standard/rtp_rtcp_extensions.cc',
+ 'test/auto_test/standard/rtp_rtcp_test.cc',
+ 'test/auto_test/standard/voe_base_misc_test.cc',
+ 'test/auto_test/standard/video_sync_test.cc',
+ 'test/auto_test/standard/volume_test.cc',
+ 'test/auto_test/resource_manager.cc',
+ 'test/auto_test/voe_conference_test.cc',
+ 'test/auto_test/voe_cpu_test.cc',
+ 'test/auto_test/voe_cpu_test.h',
+ 'test/auto_test/voe_output_test.cc',
+ 'test/auto_test/voe_standard_test.cc',
+ 'test/auto_test/voe_standard_test.h',
+ 'test/auto_test/voe_stress_test.cc',
+ 'test/auto_test/voe_stress_test.h',
+ 'test/auto_test/voe_test_defines.h',
+ 'test/auto_test/voe_test_interface.h',
+ ],
+ 'conditions': [
+ ['OS=="android"', {
+ # some tests are not supported on android yet, exclude these tests.
+ 'sources!': [
+ 'test/auto_test/standard/hardware_before_streaming_test.cc',
+ ],
+ }],
+ ['enable_protobuf==1', {
+ 'defines': [
+ 'ENABLE_RTC_EVENT_LOG',
+ ],
+ }],
+ ],
+ # Disable warnings to enable Win64 build, issue 1323.
+ 'msvs_disabled_warnings': [
+ 4267, # size_t to int truncation.
+ ],
+ },
+ ],
+ }],
['OS=="android"', {
'targets': [
{
@@ -286,6 +290,6 @@
],
}],
], # conditions
- }], # include_tests
+ }], # include_tests==1
], # conditions
}
« webrtc/modules/modules.gyp ('K') | « webrtc/modules/video_render/video_render.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698