Refactor neteq_test_support.

Take 'tools/neteq_quality_test.cc' and 'tools/neteq_quality_test.h' outside of neteq_test_support into their own target, neteq_quality_test_support.

BUG=webrtc:6228
NOTRY=True

Review-Url: https://codereview.webrtc.org/2252413002
Cr-Commit-Position: refs/heads/master@{#13831}
This commit is contained in:
ehmaldonado 2016-08-19 07:02:24 -07:00 committed by Commit bot
parent 294fb050a0
commit 861da3c662
2 changed files with 42 additions and 10 deletions

View File

@ -1144,8 +1144,6 @@ if (rtc_include_tests) {
"neteq/tools/neteq_external_decoder_test.h",
"neteq/tools/neteq_performance_test.cc",
"neteq/tools/neteq_performance_test.h",
"neteq/tools/neteq_quality_test.cc",
"neteq/tools/neteq_quality_test.h",
]
configs += [ "../..:common_config" ]
@ -1165,6 +1163,28 @@ if (rtc_include_tests) {
]
}
source_set("neteq_quality_test_support") {
testonly = true
sources = [
"neteq/tools/neteq_quality_test.cc",
"neteq/tools/neteq_quality_test.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugins (bugs.webrtc.org/163).
configs -= [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
":neteq",
":neteq_unittest_tools",
"//third_party/gflags",
]
}
config("neteq_unittest_tools_config") {
include_dirs = [ "tools" ]
}
@ -1402,7 +1422,7 @@ if (rtc_include_tests) {
deps = [
":neteq",
":neteq_test_support",
":neteq_quality_test_support",
":neteq_unittest_tools",
":webrtc_opus",
"../../test:test_support_main",
@ -1452,7 +1472,7 @@ if (rtc_include_tests) {
deps = [
":ilbc",
":neteq",
":neteq_test_support",
":neteq_quality_test_support",
":neteq_unittest_tools",
"../../system_wrappers:system_wrappers_default",
"../../test:test_support_main",
@ -1472,7 +1492,7 @@ if (rtc_include_tests) {
deps = [
":isac_fix",
":neteq",
":neteq_test_support",
":neteq_quality_test_support",
"../../test:test_support_main",
"//build/config/sanitizers:deps",
"//testing/gtest",
@ -1490,7 +1510,7 @@ if (rtc_include_tests) {
deps = [
":g711",
":neteq",
":neteq_test_support",
":neteq_quality_test_support",
"../../test:test_support_main",
"//build/config/sanitizers:deps",
"//testing/gtest",

View File

@ -167,6 +167,18 @@
'tools/neteq_external_decoder_test.h',
'tools/neteq_performance_test.cc',
'tools/neteq_performance_test.h',
],
}, # neteq_test_support
{
'target_name': 'neteq_quality_test_support',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'neteq',
'neteq_unittest_tools',
],
'sources': [
'tools/neteq_quality_test.cc',
'tools/neteq_quality_test.h',
],
@ -195,7 +207,7 @@
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/test/test.gyp:test_support_main',
'neteq',
'neteq_test_support',
'neteq_quality_test_support',
'webrtc_opus',
],
'sources': [
@ -212,7 +224,7 @@
'<(webrtc_root)/test/test.gyp:test_support_main',
'isac_fix',
'neteq',
'neteq_test_support',
'neteq_quality_test_support',
],
'sources': [
'test/neteq_isac_quality_test.cc',
@ -228,7 +240,7 @@
'<(webrtc_root)/test/test.gyp:test_support_main',
'g711',
'neteq',
'neteq_test_support',
'neteq_quality_test_support',
],
'sources': [
'test/neteq_pcmu_quality_test.cc',
@ -244,7 +256,7 @@
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
'<(webrtc_root)/test/test.gyp:test_support_main',
'neteq',
'neteq_test_support',
'neteq_quality_test_support',
'ilbc',
],
'sources': [