From 26306b139a5c153157f4d7e6b400a1047d427de7 Mon Sep 17 00:00:00 2001 From: kjellander Date: Thu, 2 Jun 2016 02:26:01 -0700 Subject: [PATCH] Remove test targets of type none. Move the sources of rtc_unittests and xmllite_xmpp_unittests into the actual targets instead of depending on none-targets. This will make it easier to create GN targets matching them. BUG=webrtc:5949 NOTRY=True NOPRESUBMIT=True Review-Url: https://codereview.webrtc.org/2029583002 Cr-Commit-Position: refs/heads/master@{#13008} --- webrtc/base/base_tests.gyp | 137 ------------------- webrtc/libjingle/xmllite/xmllite.gyp | 20 --- webrtc/libjingle/xmpp/xmpp.gyp | 29 ----- webrtc/p2p/p2p.gyp | 48 ------- webrtc/webrtc_tests.gypi | 188 ++++++++++++++++++++++++++- 5 files changed, 184 insertions(+), 238 deletions(-) diff --git a/webrtc/base/base_tests.gyp b/webrtc/base/base_tests.gyp index 3c0e912110..2ee115b267 100644 --- a/webrtc/base/base_tests.gyp +++ b/webrtc/base/base_tests.gyp @@ -40,142 +40,5 @@ '<(DEPTH)/testing/gtest.gyp:gtest', ], }, - { - 'target_name': 'rtc_base_tests', - 'type': 'none', - 'direct_dependent_settings': { - 'sources': [ - 'array_view_unittest.cc', - 'atomicops_unittest.cc', - 'autodetectproxy_unittest.cc', - 'bandwidthsmoother_unittest.cc', - 'base64_unittest.cc', - 'basictypes_unittest.cc', - 'bind_unittest.cc', - 'bitbuffer_unittest.cc', - 'buffer_unittest.cc', - 'bufferqueue_unittest.cc', - 'bytebuffer_unittest.cc', - 'byteorder_unittest.cc', - 'callback_unittest.cc', - 'copyonwritebuffer_unittest.cc', - 'crc32_unittest.cc', - 'criticalsection_unittest.cc', - 'event_tracer_unittest.cc', - 'event_unittest.cc', - 'exp_filter_unittest.cc', - 'fakeclock.cc', - 'fakeclock.h', - 'filerotatingstream_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', - 'mod_ops_unittest.cc', - 'multipart_unittest.cc', - 'nat_unittest.cc', - 'network_unittest.cc', - 'onetimeevent_unittest.cc', - 'optional_unittest.cc', - 'optionsfile_unittest.cc', - 'pathutils_unittest.cc', - 'platform_thread_unittest.cc', - 'profiler_unittest.cc', - 'proxy_unittest.cc', - 'proxydetect_unittest.cc', - 'random_unittest.cc', - 'rate_statistics_unittest.cc', - 'ratelimiter_unittest.cc', - 'ratetracker_unittest.cc', - 'referencecountedsingletonfactory_unittest.cc', - 'rollingaccumulator_unittest.cc', - 'rtccertificate_unittest.cc', - 'rtccertificategenerator_unittest.cc', - 'scopedptrcollection_unittest.cc', - 'sha1digest_unittest.cc', - 'sharedexclusivelock_unittest.cc', - 'signalthread_unittest.cc', - 'sigslot_unittest.cc', - 'sigslottester.h', - 'sigslottester.h.pump', - 'stream_unittest.cc', - 'stringencode_unittest.cc', - 'stringutils_unittest.cc', - 'swap_queue_unittest.cc', - # TODO(ronghuawu): Reenable this test. - # 'systeminfo_unittest.cc', - 'task_queue_unittest.cc', - 'task_unittest.cc', - 'testclient_unittest.cc', - 'thread_checker_unittest.cc', - 'thread_unittest.cc', - 'timedelta.h', - 'timeutils_unittest.cc', - 'urlencode_unittest.cc', - 'versionparsing_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', - 'win32window_unittest.cc', - 'win32windowpicker_unittest.cc', - 'winfirewall_unittest.cc', - ], - 'sources!': [ - # TODO(pbos): Reenable this test. - 'win32windowpicker_unittest.cc', - ], - }], - ['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-missing-braces', - '-Wno-sign-compare', - '-Wno-unused-const-variable', - ], - }, - }, - }], - ['OS=="mac"', { - 'sources': [ - 'macutils_unittest.cc', - ], - }], - ['os_posix==1', { - 'sources': [ - 'ssladapter_unittest.cc', - '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 1d76de673c..93a66d11de 100644 --- a/webrtc/libjingle/xmllite/xmllite.gyp +++ b/webrtc/libjingle/xmllite/xmllite.gyp @@ -43,24 +43,4 @@ ], }, ], # targets - 'conditions': [ - ['include_tests==1', { - 'targets' : [ - { - 'target_name': 'rtc_xmllite_unittest', - 'type': 'none', - 'direct_dependent_settings': { - 'sources': [ - 'qname_unittest.cc', - 'xmlbuilder_unittest.cc', - 'xmlelement_unittest.cc', - 'xmlnsstack_unittest.cc', - 'xmlparser_unittest.cc', - 'xmlprinter_unittest.cc', - ], - }, - }, # target rtc_xmllite_unittest - ], # targets - }], # include_tests==1 - ], # conditions } diff --git a/webrtc/libjingle/xmpp/xmpp.gyp b/webrtc/libjingle/xmpp/xmpp.gyp index 37b75122b4..1bb5e10004 100644 --- a/webrtc/libjingle/xmpp/xmpp.gyp +++ b/webrtc/libjingle/xmpp/xmpp.gyp @@ -136,34 +136,5 @@ ], }, ], # targets - 'conditions': [ - ['include_tests==1', { - 'targets' : [ - { - 'target_name': 'rtc_xmpp_unittest', - 'type': 'none', - 'direct_dependent_settings': { - 'sources': [ - 'fakexmppclient.h', - 'hangoutpubsubclient_unittest.cc', - 'jid_unittest.cc', - 'mucroomconfigtask_unittest.cc', - 'mucroomdiscoverytask_unittest.cc', - 'mucroomlookuptask_unittest.cc', - 'mucroomuniquehangoutidtask_unittest.cc', - 'pingtask_unittest.cc', - 'pubsubclient_unittest.cc', - 'pubsubtasks_unittest.cc', - 'util_unittest.cc', - 'util_unittest.h', - 'xmppengine_unittest.cc', - 'xmpplogintask_unittest.cc', - 'xmppstanzaparser_unittest.cc', - ], - }, - }, # target rtc_xmpp_unittest - ], # targets - }], # include_tests==1 - ], # conditions } diff --git a/webrtc/p2p/p2p.gyp b/webrtc/p2p/p2p.gyp index 7ec1814bc6..80b0076941 100644 --- a/webrtc/p2p/p2p.gyp +++ b/webrtc/p2p/p2p.gyp @@ -137,53 +137,5 @@ ], }, ], # targets - 'conditions': [ - ['include_tests==1', { - 'targets' : [ - { - 'target_name': 'rtc_p2p_unittest', - 'type': 'none', - 'direct_dependent_settings': { - 'sources': [ - 'base/dtlstransportchannel_unittest.cc', - 'base/fakeportallocator.h', - 'base/faketransportcontroller.h', - 'base/p2ptransportchannel_unittest.cc', - 'base/port_unittest.cc', - 'base/portallocator_unittest.cc', - 'base/pseudotcp_unittest.cc', - 'base/relayport_unittest.cc', - 'base/relayserver_unittest.cc', - 'base/stun_unittest.cc', - 'base/stunport_unittest.cc', - 'base/stunrequest_unittest.cc', - 'base/stunserver_unittest.cc', - 'base/testrelayserver.h', - 'base/teststunserver.h', - 'base/testturnserver.h', - 'base/transport_unittest.cc', - 'base/transportcontroller_unittest.cc', - 'base/transportdescriptionfactory_unittest.cc', - 'base/tcpport_unittest.cc', - 'base/turnport_unittest.cc', - 'client/basicportallocator_unittest.cc', - 'stunprober/stunprober_unittest.cc', - ], - 'conditions': [ - ['use_quic==1', { - 'sources': [ - 'quic/quicconnectionhelper_unittest.cc', - 'quic/quicsession_unittest.cc', - 'quic/quictransport_unittest.cc', - 'quic/quictransportchannel_unittest.cc', - 'quic/reliablequicstream_unittest.cc', - ], - }], - ], - }, - }, # target rtc_p2p_unittest - ], # targets - }], # include_tests==1 - ], # conditions } diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index afd34a4f62..7137b0bd77 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -14,14 +14,173 @@ 'base/base.gyp:rtc_base', 'base/base.gyp:rtc_task_queue', 'base/base_tests.gyp:rtc_base_tests_utils', - 'base/base_tests.gyp:rtc_base_tests', 'p2p/p2p.gyp:rtc_p2p', 'p2p/p2p.gyp:libstunprober', - 'p2p/p2p.gyp:rtc_p2p_unittest', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gmock.gyp:gmock', ], + 'sources': [ + 'base/array_view_unittest.cc', + 'base/atomicops_unittest.cc', + 'base/autodetectproxy_unittest.cc', + 'base/bandwidthsmoother_unittest.cc', + 'base/base64_unittest.cc', + 'base/basictypes_unittest.cc', + 'base/bind_unittest.cc', + 'base/bitbuffer_unittest.cc', + 'base/buffer_unittest.cc', + 'base/bufferqueue_unittest.cc', + 'base/bytebuffer_unittest.cc', + 'base/byteorder_unittest.cc', + 'base/callback_unittest.cc', + 'base/copyonwritebuffer_unittest.cc', + 'base/crc32_unittest.cc', + 'base/criticalsection_unittest.cc', + 'base/event_tracer_unittest.cc', + 'base/event_unittest.cc', + 'base/exp_filter_unittest.cc', + 'base/fakeclock.cc', + 'base/fakeclock.h', + 'base/filerotatingstream_unittest.cc', + 'base/fileutils_unittest.cc', + 'base/helpers_unittest.cc', + 'base/httpbase_unittest.cc', + 'base/httpcommon_unittest.cc', + 'base/httpserver_unittest.cc', + 'base/ipaddress_unittest.cc', + 'base/logging_unittest.cc', + 'base/md5digest_unittest.cc', + 'base/messagedigest_unittest.cc', + 'base/messagequeue_unittest.cc', + 'base/mod_ops_unittest.cc', + 'base/multipart_unittest.cc', + 'base/nat_unittest.cc', + 'base/network_unittest.cc', + 'base/onetimeevent_unittest.cc', + 'base/optional_unittest.cc', + 'base/optionsfile_unittest.cc', + 'base/pathutils_unittest.cc', + 'base/platform_thread_unittest.cc', + 'base/profiler_unittest.cc', + 'base/proxy_unittest.cc', + 'base/proxydetect_unittest.cc', + 'base/random_unittest.cc', + 'base/rate_statistics_unittest.cc', + 'base/ratelimiter_unittest.cc', + 'base/ratetracker_unittest.cc', + 'base/referencecountedsingletonfactory_unittest.cc', + 'base/rollingaccumulator_unittest.cc', + 'base/rtccertificate_unittest.cc', + 'base/rtccertificategenerator_unittest.cc', + 'base/scopedptrcollection_unittest.cc', + 'base/sha1digest_unittest.cc', + 'base/sharedexclusivelock_unittest.cc', + 'base/signalthread_unittest.cc', + 'base/sigslot_unittest.cc', + 'base/sigslottester.h', + 'base/sigslottester.h.pump', + 'base/stream_unittest.cc', + 'base/stringencode_unittest.cc', + 'base/stringutils_unittest.cc', + 'base/swap_queue_unittest.cc', + # TODO(ronghuawu): Reenable this test. + # 'systeminfo_unittest.cc', + 'base/task_queue_unittest.cc', + 'base/task_unittest.cc', + 'base/testclient_unittest.cc', + 'base/thread_checker_unittest.cc', + 'base/thread_unittest.cc', + 'base/timedelta.h', + 'base/timeutils_unittest.cc', + 'base/urlencode_unittest.cc', + 'base/versionparsing_unittest.cc', + # TODO(ronghuawu): Reenable this test. + # 'windowpicker_unittest.cc', + 'p2p/base/dtlstransportchannel_unittest.cc', + 'p2p/base/fakeportallocator.h', + 'p2p/base/faketransportcontroller.h', + 'p2p/base/p2ptransportchannel_unittest.cc', + 'p2p/base/port_unittest.cc', + 'p2p/base/portallocator_unittest.cc', + 'p2p/base/pseudotcp_unittest.cc', + 'p2p/base/relayport_unittest.cc', + 'p2p/base/relayserver_unittest.cc', + 'p2p/base/stun_unittest.cc', + 'p2p/base/stunport_unittest.cc', + 'p2p/base/stunrequest_unittest.cc', + 'p2p/base/stunserver_unittest.cc', + 'p2p/base/testrelayserver.h', + 'p2p/base/teststunserver.h', + 'p2p/base/testturnserver.h', + 'p2p/base/transport_unittest.cc', + 'p2p/base/transportcontroller_unittest.cc', + 'p2p/base/transportdescriptionfactory_unittest.cc', + 'p2p/base/tcpport_unittest.cc', + 'p2p/base/turnport_unittest.cc', + 'p2p/client/basicportallocator_unittest.cc', + 'p2p/stunprober/stunprober_unittest.cc', + ], 'conditions': [ + ['OS=="linux"', { + 'sources': [ + 'base/latebindingsymboltable_unittest.cc', + # TODO(ronghuawu): Reenable this test. + # 'linux_unittest.cc', + 'base/linuxfdwalk_unittest.cc', + ], + }], + ['OS=="win"', { + 'sources': [ + 'base/win32_unittest.cc', + 'base/win32regkey_unittest.cc', + 'base/win32window_unittest.cc', + 'base/win32windowpicker_unittest.cc', + 'base/winfirewall_unittest.cc', + ], + 'sources!': [ + # TODO(pbos): Reenable this test. + 'base/win32windowpicker_unittest.cc', + ], + }], + ['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-missing-braces', + '-Wno-sign-compare', + '-Wno-unused-const-variable', + ], + }, + }, + }], + ['OS=="mac"', { + 'sources': [ + 'base/macutils_unittest.cc', + ], + }], + ['os_posix==1', { + 'sources': [ + 'base/ssladapter_unittest.cc', + 'base/sslidentity_unittest.cc', + 'base/sslstreamadapter_unittest.cc', + ], + }], + ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { + 'defines': [ + 'CARBON_DEPRECATED=YES', + ], + }], + ['use_quic==1', { + 'sources': [ + 'p2p/quic/quicconnectionhelper_unittest.cc', + 'p2p/quic/quicsession_unittest.cc', + 'p2p/quic/quictransport_unittest.cc', + 'p2p/quic/quictransportchannel_unittest.cc', + 'p2p/quic/reliablequicstream_unittest.cc', + ], + }], ['OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', @@ -41,10 +200,31 @@ 'base/base_tests.gyp:rtc_base_tests_utils', # needed for main() 'libjingle/xmllite/xmllite.gyp:rtc_xmllite', 'libjingle/xmpp/xmpp.gyp:rtc_xmpp', - 'libjingle/xmllite/xmllite.gyp:rtc_xmllite_unittest', - 'libjingle/xmpp/xmpp.gyp:rtc_xmpp_unittest', '<(DEPTH)/testing/gtest.gyp:gtest', ], + 'sources': [ + 'libjingle/xmllite/qname_unittest.cc', + 'libjingle/xmllite/xmlbuilder_unittest.cc', + 'libjingle/xmllite/xmlelement_unittest.cc', + 'libjingle/xmllite/xmlnsstack_unittest.cc', + 'libjingle/xmllite/xmlparser_unittest.cc', + 'libjingle/xmllite/xmlprinter_unittest.cc', + 'libjingle/xmpp/fakexmppclient.h', + 'libjingle/xmpp/hangoutpubsubclient_unittest.cc', + 'libjingle/xmpp/jid_unittest.cc', + 'libjingle/xmpp/mucroomconfigtask_unittest.cc', + 'libjingle/xmpp/mucroomdiscoverytask_unittest.cc', + 'libjingle/xmpp/mucroomlookuptask_unittest.cc', + 'libjingle/xmpp/mucroomuniquehangoutidtask_unittest.cc', + 'libjingle/xmpp/pingtask_unittest.cc', + 'libjingle/xmpp/pubsubclient_unittest.cc', + 'libjingle/xmpp/pubsubtasks_unittest.cc', + 'libjingle/xmpp/util_unittest.cc', + 'libjingle/xmpp/util_unittest.h', + 'libjingle/xmpp/xmppengine_unittest.cc', + 'libjingle/xmpp/xmpplogintask_unittest.cc', + 'libjingle/xmpp/xmppstanzaparser_unittest.cc', + ], }, { 'target_name': 'webrtc_tests',