generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Put base tests in webrtc_tests.gyp

Browse Source 
BUG=N/A
R=andrew@webrtc.org, pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14249004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7140 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-09-10 17:28:19 +00:00
parent a8d2ee7f3b
commit b2efb6771c
11 changed files with 147 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
talk/libjingle.gyp
View File

@@ -303,7 +303,7 @@
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/expat/expat.gyp:expat', '<(DEPTH)/third_party/expat/expat.gyp:expat',
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
'<(webrtc_root)/base/base.gyp:webrtc_base', '<(webrtc_root)/base/base.gyp:rtc_base',
], ],
'export_dependent_settings': [ 'export_dependent_settings': [
'<(DEPTH)/third_party/expat/expat.gyp:expat', '<(DEPTH)/third_party/expat/expat.gyp:expat',

16
talk/libjingle_tests.gyp
View File

@@ -33,7 +33,7 @@
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv', '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
'<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<@(libjingle_tests_additional_deps)', '<@(libjingle_tests_additional_deps)',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
@@ -74,8 +74,8 @@
'type': 'executable', 'type': 'executable',
'includes': [ 'build/ios_tests.gypi', ], 'includes': [ 'build/ios_tests.gypi', ],
'dependencies': [ 'dependencies': [
'<(webrtc_root)/base/base.gyp:webrtc_base', '<(webrtc_root)/base/base.gyp:rtc_base',
'<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'libjingle.gyp:libjingle', 'libjingle.gyp:libjingle',
'libjingle_unittest_main', 'libjingle_unittest_main',
], ],
@@ -107,7 +107,7 @@
'target_name': 'libjingle_sound_unittest', 'target_name': 'libjingle_sound_unittest',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'libjingle.gyp:libjingle_sound', 'libjingle.gyp:libjingle_sound',
'libjingle_unittest_main', 'libjingle_unittest_main',
], ],
@@ -119,7 +119,7 @@
'target_name': 'libjingle_media_unittest', 'target_name': 'libjingle_media_unittest',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'libjingle.gyp:libjingle_media', 'libjingle.gyp:libjingle_media',
'libjingle_unittest_main', 'libjingle_unittest_main',
], ],
@@ -193,7 +193,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp', '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
'<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'libjingle.gyp:libjingle', 'libjingle.gyp:libjingle',
'libjingle.gyp:libjingle_p2p', 'libjingle.gyp:libjingle_p2p',
'libjingle_unittest_main', 'libjingle_unittest_main',
@@ -252,7 +252,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'libjingle.gyp:libjingle', 'libjingle.gyp:libjingle',
'libjingle.gyp:libjingle_p2p', 'libjingle.gyp:libjingle_p2p',
'libjingle.gyp:libjingle_peerconnection', 'libjingle.gyp:libjingle_peerconnection',
@@ -385,7 +385,7 @@
'type': 'executable', 'type': 'executable',
'includes': [ 'build/ios_tests.gypi', ], 'includes': [ 'build/ios_tests.gypi', ],
'dependencies': [ 'dependencies': [
'<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'libjingle.gyp:libjingle_peerconnection_objc', 'libjingle.gyp:libjingle_peerconnection_objc',
], ],
'sources': [ 'sources': [

4
webrtc/base/base.gyp
View File

@@ -25,7 +25,7 @@
], ],
'targets': [ 'targets': [
{ {
'target_name': 'webrtc_base', 'target_name': 'rtc_base',
'type': 'static_library', 'type': 'static_library',
'defines': [ 'defines': [
'FEATURE_ENABLE_SSL', 'FEATURE_ENABLE_SSL',
@@ -316,7 +316,7 @@
'../overrides/webrtc/base/logging.h', '../overrides/webrtc/base/logging.h',
'../overrides/webrtc/base/win32socketinit.cc', '../overrides/webrtc/base/win32socketinit.cc',
], ],
# TODO(henrike): issue 3307, make webrtc_base build without disabling # TODO(henrike): issue 3307, make rtc_base build without disabling
# these flags. # these flags.
'cflags!': [ 'cflags!': [
'-Wextra', '-Wextra',

243
webrtc/base/base_tests.gyp
View File

@@ -9,7 +9,7 @@
'includes': [ '../build/common.gypi', ], 'includes': [ '../build/common.gypi', ],
'targets': [ 'targets': [
{ {
'target_name': 'webrtc_base_tests_utils', 'target_name': 'rtc_base_tests_utils',
'type': 'static_library', 'type': 'static_library',
'sources': [ 'sources': [
'unittest_main.cc', 'unittest_main.cc',
@@ -29,7 +29,7 @@
'GTEST_RELATIVE_PATH', 'GTEST_RELATIVE_PATH',
], ],
'dependencies': [ 'dependencies': [
'base.gyp:webrtc_base', 'base.gyp:rtc_base',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
@@ -42,127 +42,124 @@
], ],
}, },
{ {
'target_name': 'webrtc_base_tests', 'target_name': 'rtc_base_tests',
'type': 'executable', 'type': 'none',
'dependencies': [ 'direct_dependent_settings': {
'<(DEPTH)/testing/gtest.gyp:gtest', 'sources': [
'base.gyp:webrtc_base', 'asynchttprequest_unittest.cc',
'webrtc_base_tests_utils', 'atomicops_unittest.cc',
], 'autodetectproxy_unittest.cc',
'sources': [ 'bandwidthsmoother_unittest.cc',
'asynchttprequest_unittest.cc', 'base64_unittest.cc',
'atomicops_unittest.cc', 'basictypes_unittest.cc',
'autodetectproxy_unittest.cc', 'bind_unittest.cc',
'bandwidthsmoother_unittest.cc', 'buffer_unittest.cc',
'base64_unittest.cc', 'bytebuffer_unittest.cc',
'basictypes_unittest.cc', 'byteorder_unittest.cc',
'bind_unittest.cc', 'callback_unittest.cc',
'buffer_unittest.cc', 'cpumonitor_unittest.cc',
'bytebuffer_unittest.cc', 'crc32_unittest.cc',
'byteorder_unittest.cc', 'criticalsection_unittest.cc',
'callback_unittest.cc', 'event_unittest.cc',
'cpumonitor_unittest.cc', 'exp_filter_unittest.cc',
'crc32_unittest.cc', 'filelock_unittest.cc',
'criticalsection_unittest.cc', 'fileutils_unittest.cc',
'event_unittest.cc', 'helpers_unittest.cc',
'exp_filter_unittest.cc', 'httpbase_unittest.cc',
'filelock_unittest.cc', 'httpcommon_unittest.cc',
'fileutils_unittest.cc', 'httpserver_unittest.cc',
'helpers_unittest.cc', 'ipaddress_unittest.cc',
'httpbase_unittest.cc', 'logging_unittest.cc',
'httpcommon_unittest.cc', 'md5digest_unittest.cc',
'httpserver_unittest.cc', 'messagedigest_unittest.cc',
'ipaddress_unittest.cc', 'messagequeue_unittest.cc',
'logging_unittest.cc', 'multipart_unittest.cc',
'md5digest_unittest.cc', 'nat_unittest.cc',
'messagedigest_unittest.cc', 'network_unittest.cc',
'messagequeue_unittest.cc', 'nullsocketserver_unittest.cc',
'multipart_unittest.cc', 'optionsfile_unittest.cc',
'nat_unittest.cc', 'pathutils_unittest.cc',
'network_unittest.cc', 'physicalsocketserver_unittest.cc',
'nullsocketserver_unittest.cc', 'profiler_unittest.cc',
'optionsfile_unittest.cc', 'proxy_unittest.cc',
'pathutils_unittest.cc', 'proxydetect_unittest.cc',
'physicalsocketserver_unittest.cc', 'ratelimiter_unittest.cc',
'profiler_unittest.cc', 'ratetracker_unittest.cc',
'proxy_unittest.cc', 'referencecountedsingletonfactory_unittest.cc',
'proxydetect_unittest.cc', 'rollingaccumulator_unittest.cc',
'ratelimiter_unittest.cc', 'scopedptrcollection_unittest.cc',
'ratetracker_unittest.cc', 'sha1digest_unittest.cc',
'referencecountedsingletonfactory_unittest.cc', 'sharedexclusivelock_unittest.cc',
'rollingaccumulator_unittest.cc', 'signalthread_unittest.cc',
'scopedptrcollection_unittest.cc', 'sigslot_unittest.cc',
'sha1digest_unittest.cc', 'sigslottester.h',
'sharedexclusivelock_unittest.cc', 'sigslottester.h.pump',
'signalthread_unittest.cc', 'socket_unittest.cc',
'sigslot_unittest.cc', 'socket_unittest.h',
'sigslottester.h', 'socketaddress_unittest.cc',
'sigslottester.h.pump', 'stream_unittest.cc',
'socket_unittest.cc', 'stringencode_unittest.cc',
'socket_unittest.h', 'stringutils_unittest.cc',
'socketaddress_unittest.cc', # TODO(ronghuawu): Reenable this test.
'stream_unittest.cc', # 'systeminfo_unittest.cc',
'stringencode_unittest.cc', 'task_unittest.cc',
'stringutils_unittest.cc', 'testclient_unittest.cc',
# TODO(ronghuawu): Reenable this test. 'thread_checker_unittest.cc',
# 'systeminfo_unittest.cc', 'thread_unittest.cc',
'task_unittest.cc', 'timeutils_unittest.cc',
'testclient_unittest.cc', 'urlencode_unittest.cc',
'thread_checker_unittest.cc', 'versionparsing_unittest.cc',
'thread_unittest.cc', 'virtualsocket_unittest.cc',
'timeutils_unittest.cc', # TODO(ronghuawu): Reenable this test.
'urlencode_unittest.cc', # 'windowpicker_unittest.cc',
'versionparsing_unittest.cc', ],
'virtualsocket_unittest.cc', 'conditions': [
# TODO(ronghuawu): Reenable this test. ['OS=="linux"', {
# 'windowpicker_unittest.cc', 'sources': [
], 'latebindingsymboltable_unittest.cc',
'conditions': [ # TODO(ronghuawu): Reenable this test.
['OS=="linux"', { # 'linux_unittest.cc',
'sources': [ 'linuxfdwalk_unittest.cc',
'latebindingsymboltable_unittest.cc', ],
# TODO(ronghuawu): Reenable this test. }],
# 'linux_unittest.cc', ['OS=="win"', {
'linuxfdwalk_unittest.cc', 'sources': [
], 'win32_unittest.cc',
}], 'win32regkey_unittest.cc',
['OS=="win"', { 'win32socketserver_unittest.cc',
'sources': [ 'win32toolhelp_unittest.cc',
'win32_unittest.cc', 'win32window_unittest.cc',
'win32regkey_unittest.cc', 'win32windowpicker_unittest.cc',
'win32socketserver_unittest.cc', 'winfirewall_unittest.cc',
'win32toolhelp_unittest.cc', ],
'win32window_unittest.cc', 'sources!': [
'win32windowpicker_unittest.cc', # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot
'winfirewall_unittest.cc', # then reenable these tests.
], 'physicalsocketserver_unittest.cc',
'sources!': [ 'socket_unittest.cc',
# TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot 'win32socketserver_unittest.cc',
# then reenable these tests. 'win32windowpicker_unittest.cc',
'physicalsocketserver_unittest.cc', ],
'socket_unittest.cc', }],
'win32socketserver_unittest.cc', ['OS=="mac"', {
'win32windowpicker_unittest.cc', 'sources': [
], 'macsocketserver_unittest.cc',
}], 'macutils_unittest.cc',
['OS=="mac"', { ],
'sources': [ }],
'macsocketserver_unittest.cc', ['os_posix==1', {
'macutils_unittest.cc', 'sources': [
], 'sslidentity_unittest.cc',
}], 'sslstreamadapter_unittest.cc',
['os_posix==1', { ],
'sources': [ }],
'sslidentity_unittest.cc', ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
'sslstreamadapter_unittest.cc', 'defines': [
], 'CARBON_DEPRECATED=YES',
}], ],
['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { }],
'defines': [ ], # conditions
'CARBON_DEPRECATED=YES', },
],
}],
], # conditions
}, },
], ],
} }

2
webrtc/libjingle/xmllite/xmllite.gyp
View File

@@ -13,7 +13,7 @@
'target_name': 'rtc_xmllite', 'target_name': 'rtc_xmllite',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'<(webrtc_root)/base/base.gyp:webrtc_base', '<(webrtc_root)/base/base.gyp:rtc_base',
'<(DEPTH)/third_party/expat/expat.gyp:expat', '<(DEPTH)/third_party/expat/expat.gyp:expat',
], ],
'export_dependent_settings': [ 'export_dependent_settings': [

2
webrtc/libjingle/xmllite/xmllite_tests.gyp
View File

@@ -14,7 +14,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'xmllite.gyp:rtc_xmllite', 'xmllite.gyp:rtc_xmllite',
], ],
'cflags_cc!': [ 'cflags_cc!': [

2
webrtc/sound/sound.gyp
View File

@@ -13,7 +13,7 @@
'target_name': 'rtc_sound', 'target_name': 'rtc_sound',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'<(webrtc_root)/base/base.gyp:webrtc_base', '<(webrtc_root)/base/base.gyp:rtc_base',
], ],
'sources': [ 'sources': [
'automaticallychosensoundsystem.h', 'automaticallychosensoundsystem.h',

2
webrtc/sound/sound_tests.gyp
View File

@@ -14,7 +14,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/sound/sound.gyp:rtc_sound', '<(webrtc_root)/sound/sound.gyp:rtc_sound',
], ],
'cflags_cc!': [ 'cflags_cc!': [

2
webrtc/system_wrappers/source/system_wrappers.gyp
View File

@@ -17,7 +17,7 @@
'../interface', '../interface',
], ],
'dependencies': [ 'dependencies': [
'../../base/base.gyp:webrtc_base', '../../base/base.gyp:rtc_base',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [

2
webrtc/webrtc.gyp
View File

@@ -43,7 +43,6 @@
'conditions': [ 'conditions': [
['include_tests==1', { ['include_tests==1', {
'dependencies': [ 'dependencies': [
'base/base_tests.gyp:*',
'common_video/common_video_unittests.gyp:*', 'common_video/common_video_unittests.gyp:*',
'libjingle/xmllite/xmllite_tests.gyp:*', 'libjingle/xmllite/xmllite_tests.gyp:*',
'sound/sound_tests.gyp:*', 'sound/sound_tests.gyp:*',
@@ -53,6 +52,7 @@
'test/webrtc_test_common.gyp:webrtc_test_common_unittests', 'test/webrtc_test_common.gyp:webrtc_test_common_unittests',
'tools/tools.gyp:*', 'tools/tools.gyp:*',
'webrtc_tests', 'webrtc_tests',
'rtc_unittests',
], ],
}], }],
], ],

10
webrtc/webrtc_tests.gypi
View File

@@ -7,6 +7,16 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'targets': [ 'targets': [
{
'target_name': 'rtc_unittests',
'type': 'executable',
'dependencies': [
'base/base.gyp:rtc_base',
'base/base_tests.gyp:rtc_base_tests_utils',
'base/base_tests.gyp:rtc_base_tests',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
},
{ {
'target_name': 'webrtc_tests', 'target_name': 'webrtc_tests',
'type': 'none', 'type': 'none',