zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add voe_cmd_test to voice_engine/BUILD.gn (and remove it from voice_engine.gyp, together with the channel_transport gyp target)

Browse Source 
BUG=webrtc:6323
NOTRY=True

Review-Url: https://codereview.webrtc.org/2343813003
Cr-Commit-Position: refs/heads/master@{#14243}
This commit is contained in:
solenberg
2016-09-15 13:12:02 -07:00
committed by Commit bot
parent 232c56ba9a
commit fb2c1d0636
2 changed files with 25 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
webrtc/voice_engine/BUILD.gn
View File

@ -236,6 +236,31 @@ if (rtc_include_tests) {
}
}
rtc_executable("voe_cmd_test") {
testonly = true
deps = [
":channel_transport",
":voice_engine",
"//testing/gtest",
"//third_party/gflags",
"//webrtc:rtc_event_log",
"//webrtc/system_wrappers",
"//webrtc/system_wrappers:system_wrappers_default",
"//webrtc/test:test_support",
]
sources = [
"test/cmd_test/voe_cmd_test.cc",
]
if (is_clang) {
# Suppress warnings from Chrome's Clang plugins.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
if (!is_ios) {
rtc_executable("voe_auto_test") {
testonly = true

76
webrtc/voice_engine/voice_engine.gyp
View File

@ -109,80 +109,4 @@
]
},
],
'conditions': [
['OS=="win"', {
'defines': ['WEBRTC_DRIFT_COMPENSATION_SUPPORTED',],
}],
['include_tests==1', {
'targets': [
{
'target_name': 'channel_transport',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
],
'sources': [
'test/channel_transport/channel_transport.cc',
'test/channel_transport/channel_transport.h',
'test/channel_transport/traffic_control_win.cc',
'test/channel_transport/traffic_control_win.h',
'test/channel_transport/udp_socket_manager_posix.cc',
'test/channel_transport/udp_socket_manager_posix.h',
'test/channel_transport/udp_socket_manager_wrapper.cc',
'test/channel_transport/udp_socket_manager_wrapper.h',
'test/channel_transport/udp_socket_posix.cc',
'test/channel_transport/udp_socket_posix.h',
'test/channel_transport/udp_socket_wrapper.cc',
'test/channel_transport/udp_socket_wrapper.h',
'test/channel_transport/udp_socket2_manager_win.cc',
'test/channel_transport/udp_socket2_manager_win.h',
'test/channel_transport/udp_socket2_win.cc',
'test/channel_transport/udp_socket2_win.h',
'test/channel_transport/udp_transport.h',
'test/channel_transport/udp_transport_impl.cc',
'test/channel_transport/udp_transport_impl.h',
],
'msvs_disabled_warnings': [
4302, # cast truncation
],
'conditions': [
['OS=="win" and clang==1', {
'msvs_settings': {
'VCCLCompilerTool': {
'AdditionalOptions': [
# Disable warnings failing when compiling with Clang on Windows.
# https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
'-Wno-parentheses-equality',
'-Wno-reorder',
'-Wno-tautological-constant-out-of-range-compare',
'-Wno-unused-private-field',
],
},
},
}],
], # conditions.
},
{
# command line test that should work on linux/mac/win
'target_name': 'voe_cmd_test',
'type': 'executable',
'dependencies': [
'channel_transport',
'voice_engine',
'<(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:test_support',
'<(webrtc_root)/webrtc.gyp:rtc_event_log',
],
'sources': [
'test/cmd_test/voe_cmd_test.cc',
],
},
], # targets
}], # include_tests==1
], # conditions
}