From b2efb6771c3a5c492d8005a72b3c69cc18d1b408 Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Wed, 10 Sep 2014 17:28:19 +0000 Subject: [PATCH] Put base tests in webrtc_tests.gyp 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 --- talk/libjingle.gyp | 2 +- talk/libjingle_tests.gyp | 16 +- webrtc/base/base.gyp | 4 +- webrtc/base/base_tests.gyp | 243 +++++++++--------- webrtc/libjingle/xmllite/xmllite.gyp | 2 +- webrtc/libjingle/xmllite/xmllite_tests.gyp | 2 +- webrtc/sound/sound.gyp | 2 +- webrtc/sound/sound_tests.gyp | 2 +- .../source/system_wrappers.gyp | 2 +- webrtc/webrtc.gyp | 2 +- webrtc/webrtc_tests.gypi | 10 + 11 files changed, 147 insertions(+), 140 deletions(-) diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index e0cc4eb2a..1690cf855 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -303,7 +303,7 @@ 'dependencies': [ '<(DEPTH)/third_party/expat/expat.gyp:expat', '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', - '<(webrtc_root)/base/base.gyp:webrtc_base', + '<(webrtc_root)/base/base.gyp:rtc_base', ], 'export_dependent_settings': [ '<(DEPTH)/third_party/expat/expat.gyp:expat', diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp index 02651ef56..a44a9500e 100755 --- a/talk/libjingle_tests.gyp +++ b/talk/libjingle_tests.gyp @@ -33,7 +33,7 @@ 'type': 'static_library', 'dependencies': [ '<(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)', ], 'direct_dependent_settings': { @@ -74,8 +74,8 @@ 'type': 'executable', 'includes': [ 'build/ios_tests.gypi', ], 'dependencies': [ - '<(webrtc_root)/base/base.gyp:webrtc_base', - '<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils', + '<(webrtc_root)/base/base.gyp:rtc_base', + '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', 'libjingle.gyp:libjingle', 'libjingle_unittest_main', ], @@ -107,7 +107,7 @@ 'target_name': 'libjingle_sound_unittest', 'type': 'executable', '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_unittest_main', ], @@ -119,7 +119,7 @@ 'target_name': 'libjingle_media_unittest', 'type': 'executable', '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_unittest_main', ], @@ -193,7 +193,7 @@ 'type': 'executable', 'dependencies': [ '<(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_p2p', 'libjingle_unittest_main', @@ -252,7 +252,7 @@ 'type': 'executable', 'dependencies': [ '<(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_p2p', 'libjingle.gyp:libjingle_peerconnection', @@ -385,7 +385,7 @@ 'type': 'executable', 'includes': [ 'build/ios_tests.gypi', ], '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', ], 'sources': [ diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp index cf35b6b98..a17c97981 100644 --- a/webrtc/base/base.gyp +++ b/webrtc/base/base.gyp @@ -25,7 +25,7 @@ ], 'targets': [ { - 'target_name': 'webrtc_base', + 'target_name': 'rtc_base', 'type': 'static_library', 'defines': [ 'FEATURE_ENABLE_SSL', @@ -316,7 +316,7 @@ '../overrides/webrtc/base/logging.h', '../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. 'cflags!': [ '-Wextra', diff --git a/webrtc/base/base_tests.gyp b/webrtc/base/base_tests.gyp index 690932d05..5ad3d2da8 100644 --- a/webrtc/base/base_tests.gyp +++ b/webrtc/base/base_tests.gyp @@ -9,7 +9,7 @@ 'includes': [ '../build/common.gypi', ], 'targets': [ { - 'target_name': 'webrtc_base_tests_utils', + 'target_name': 'rtc_base_tests_utils', 'type': 'static_library', 'sources': [ 'unittest_main.cc', @@ -29,7 +29,7 @@ 'GTEST_RELATIVE_PATH', ], 'dependencies': [ - 'base.gyp:webrtc_base', + 'base.gyp:rtc_base', '<(DEPTH)/testing/gtest.gyp:gtest', ], 'direct_dependent_settings': { @@ -42,127 +42,124 @@ ], }, { - 'target_name': 'webrtc_base_tests', - 'type': 'executable', - 'dependencies': [ - '<(DEPTH)/testing/gtest.gyp:gtest', - 'base.gyp:webrtc_base', - 'webrtc_base_tests_utils', - ], - 'sources': [ - 'asynchttprequest_unittest.cc', - 'atomicops_unittest.cc', - 'autodetectproxy_unittest.cc', - 'bandwidthsmoother_unittest.cc', - 'base64_unittest.cc', - 'basictypes_unittest.cc', - 'bind_unittest.cc', - 'buffer_unittest.cc', - 'bytebuffer_unittest.cc', - 'byteorder_unittest.cc', - 'callback_unittest.cc', - 'cpumonitor_unittest.cc', - 'crc32_unittest.cc', - 'criticalsection_unittest.cc', - 'event_unittest.cc', - 'exp_filter_unittest.cc', - 'filelock_unittest.cc', - 'fileutils_unittest.cc', - 'helpers_unittest.cc', - 'httpbase_unittest.cc', - 'httpcommon_unittest.cc', - 'httpserver_unittest.cc', - 'ipaddress_unittest.cc', - 'logging_unittest.cc', - 'md5digest_unittest.cc', - 'messagedigest_unittest.cc', - 'messagequeue_unittest.cc', - 'multipart_unittest.cc', - 'nat_unittest.cc', - 'network_unittest.cc', - 'nullsocketserver_unittest.cc', - 'optionsfile_unittest.cc', - 'pathutils_unittest.cc', - 'physicalsocketserver_unittest.cc', - 'profiler_unittest.cc', - 'proxy_unittest.cc', - 'proxydetect_unittest.cc', - 'ratelimiter_unittest.cc', - 'ratetracker_unittest.cc', - 'referencecountedsingletonfactory_unittest.cc', - 'rollingaccumulator_unittest.cc', - 'scopedptrcollection_unittest.cc', - 'sha1digest_unittest.cc', - 'sharedexclusivelock_unittest.cc', - 'signalthread_unittest.cc', - 'sigslot_unittest.cc', - 'sigslottester.h', - 'sigslottester.h.pump', - 'socket_unittest.cc', - 'socket_unittest.h', - 'socketaddress_unittest.cc', - 'stream_unittest.cc', - 'stringencode_unittest.cc', - 'stringutils_unittest.cc', - # TODO(ronghuawu): Reenable this test. - # 'systeminfo_unittest.cc', - 'task_unittest.cc', - 'testclient_unittest.cc', - 'thread_checker_unittest.cc', - 'thread_unittest.cc', - 'timeutils_unittest.cc', - 'urlencode_unittest.cc', - 'versionparsing_unittest.cc', - 'virtualsocket_unittest.cc', - # TODO(ronghuawu): Reenable this test. - # 'windowpicker_unittest.cc', - ], - 'conditions': [ - ['OS=="linux"', { - 'sources': [ - 'latebindingsymboltable_unittest.cc', - # TODO(ronghuawu): Reenable this test. - # 'linux_unittest.cc', - 'linuxfdwalk_unittest.cc', - ], - }], - ['OS=="win"', { - 'sources': [ - 'win32_unittest.cc', - 'win32regkey_unittest.cc', - 'win32socketserver_unittest.cc', - 'win32toolhelp_unittest.cc', - 'win32window_unittest.cc', - 'win32windowpicker_unittest.cc', - 'winfirewall_unittest.cc', - ], - 'sources!': [ - # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot - # then reenable these tests. - 'physicalsocketserver_unittest.cc', - 'socket_unittest.cc', - 'win32socketserver_unittest.cc', - 'win32windowpicker_unittest.cc', - ], - }], - ['OS=="mac"', { - 'sources': [ - 'macsocketserver_unittest.cc', - 'macutils_unittest.cc', - ], - }], - ['os_posix==1', { - 'sources': [ - 'sslidentity_unittest.cc', - 'sslstreamadapter_unittest.cc', - ], - }], - ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { - 'defines': [ - 'CARBON_DEPRECATED=YES', - ], - }], - ], # conditions + 'target_name': 'rtc_base_tests', + 'type': 'none', + 'direct_dependent_settings': { + 'sources': [ + 'asynchttprequest_unittest.cc', + 'atomicops_unittest.cc', + 'autodetectproxy_unittest.cc', + 'bandwidthsmoother_unittest.cc', + 'base64_unittest.cc', + 'basictypes_unittest.cc', + 'bind_unittest.cc', + 'buffer_unittest.cc', + 'bytebuffer_unittest.cc', + 'byteorder_unittest.cc', + 'callback_unittest.cc', + 'cpumonitor_unittest.cc', + 'crc32_unittest.cc', + 'criticalsection_unittest.cc', + 'event_unittest.cc', + 'exp_filter_unittest.cc', + 'filelock_unittest.cc', + 'fileutils_unittest.cc', + 'helpers_unittest.cc', + 'httpbase_unittest.cc', + 'httpcommon_unittest.cc', + 'httpserver_unittest.cc', + 'ipaddress_unittest.cc', + 'logging_unittest.cc', + 'md5digest_unittest.cc', + 'messagedigest_unittest.cc', + 'messagequeue_unittest.cc', + 'multipart_unittest.cc', + 'nat_unittest.cc', + 'network_unittest.cc', + 'nullsocketserver_unittest.cc', + 'optionsfile_unittest.cc', + 'pathutils_unittest.cc', + 'physicalsocketserver_unittest.cc', + 'profiler_unittest.cc', + 'proxy_unittest.cc', + 'proxydetect_unittest.cc', + 'ratelimiter_unittest.cc', + 'ratetracker_unittest.cc', + 'referencecountedsingletonfactory_unittest.cc', + 'rollingaccumulator_unittest.cc', + 'scopedptrcollection_unittest.cc', + 'sha1digest_unittest.cc', + 'sharedexclusivelock_unittest.cc', + 'signalthread_unittest.cc', + 'sigslot_unittest.cc', + 'sigslottester.h', + 'sigslottester.h.pump', + 'socket_unittest.cc', + 'socket_unittest.h', + 'socketaddress_unittest.cc', + 'stream_unittest.cc', + 'stringencode_unittest.cc', + 'stringutils_unittest.cc', + # TODO(ronghuawu): Reenable this test. + # 'systeminfo_unittest.cc', + 'task_unittest.cc', + 'testclient_unittest.cc', + 'thread_checker_unittest.cc', + 'thread_unittest.cc', + 'timeutils_unittest.cc', + 'urlencode_unittest.cc', + 'versionparsing_unittest.cc', + 'virtualsocket_unittest.cc', + # TODO(ronghuawu): Reenable this test. + # 'windowpicker_unittest.cc', + ], + 'conditions': [ + ['OS=="linux"', { + 'sources': [ + 'latebindingsymboltable_unittest.cc', + # TODO(ronghuawu): Reenable this test. + # 'linux_unittest.cc', + 'linuxfdwalk_unittest.cc', + ], + }], + ['OS=="win"', { + 'sources': [ + 'win32_unittest.cc', + 'win32regkey_unittest.cc', + 'win32socketserver_unittest.cc', + 'win32toolhelp_unittest.cc', + 'win32window_unittest.cc', + 'win32windowpicker_unittest.cc', + 'winfirewall_unittest.cc', + ], + 'sources!': [ + # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot + # then reenable these tests. + 'physicalsocketserver_unittest.cc', + 'socket_unittest.cc', + 'win32socketserver_unittest.cc', + 'win32windowpicker_unittest.cc', + ], + }], + ['OS=="mac"', { + 'sources': [ + 'macsocketserver_unittest.cc', + 'macutils_unittest.cc', + ], + }], + ['os_posix==1', { + 'sources': [ + 'sslidentity_unittest.cc', + 'sslstreamadapter_unittest.cc', + ], + }], + ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { + 'defines': [ + 'CARBON_DEPRECATED=YES', + ], + }], + ], # conditions + }, }, ], } diff --git a/webrtc/libjingle/xmllite/xmllite.gyp b/webrtc/libjingle/xmllite/xmllite.gyp index c4483232c..e1bef960c 100644 --- a/webrtc/libjingle/xmllite/xmllite.gyp +++ b/webrtc/libjingle/xmllite/xmllite.gyp @@ -13,7 +13,7 @@ 'target_name': 'rtc_xmllite', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/base/base.gyp:webrtc_base', + '<(webrtc_root)/base/base.gyp:rtc_base', '<(DEPTH)/third_party/expat/expat.gyp:expat', ], 'export_dependent_settings': [ diff --git a/webrtc/libjingle/xmllite/xmllite_tests.gyp b/webrtc/libjingle/xmllite/xmllite_tests.gyp index a9173bc9e..b71a9b6b5 100644 --- a/webrtc/libjingle/xmllite/xmllite_tests.gyp +++ b/webrtc/libjingle/xmllite/xmllite_tests.gyp @@ -14,7 +14,7 @@ 'type': 'executable', 'dependencies': [ '<(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', ], 'cflags_cc!': [ diff --git a/webrtc/sound/sound.gyp b/webrtc/sound/sound.gyp index b1a163fae..a7d929b25 100644 --- a/webrtc/sound/sound.gyp +++ b/webrtc/sound/sound.gyp @@ -13,7 +13,7 @@ 'target_name': 'rtc_sound', 'type': 'static_library', 'dependencies': [ - '<(webrtc_root)/base/base.gyp:webrtc_base', + '<(webrtc_root)/base/base.gyp:rtc_base', ], 'sources': [ 'automaticallychosensoundsystem.h', diff --git a/webrtc/sound/sound_tests.gyp b/webrtc/sound/sound_tests.gyp index 53f979f9c..3fe3574c6 100644 --- a/webrtc/sound/sound_tests.gyp +++ b/webrtc/sound/sound_tests.gyp @@ -14,7 +14,7 @@ 'type': 'executable', 'dependencies': [ '<(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', ], 'cflags_cc!': [ diff --git a/webrtc/system_wrappers/source/system_wrappers.gyp b/webrtc/system_wrappers/source/system_wrappers.gyp index 66b34356c..610f6b087 100644 --- a/webrtc/system_wrappers/source/system_wrappers.gyp +++ b/webrtc/system_wrappers/source/system_wrappers.gyp @@ -17,7 +17,7 @@ '../interface', ], 'dependencies': [ - '../../base/base.gyp:webrtc_base', + '../../base/base.gyp:rtc_base', ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp index 12d38dba7..b17077bd0 100644 --- a/webrtc/webrtc.gyp +++ b/webrtc/webrtc.gyp @@ -43,7 +43,6 @@ 'conditions': [ ['include_tests==1', { 'dependencies': [ - 'base/base_tests.gyp:*', 'common_video/common_video_unittests.gyp:*', 'libjingle/xmllite/xmllite_tests.gyp:*', 'sound/sound_tests.gyp:*', @@ -53,6 +52,7 @@ 'test/webrtc_test_common.gyp:webrtc_test_common_unittests', 'tools/tools.gyp:*', 'webrtc_tests', + 'rtc_unittests', ], }], ], diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index 68b738dcf..75849543e 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { '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', 'type': 'none',