| Index: webrtc/webrtc_tests.gypi
|
| diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
|
| index afd34a4f62ec60c589930d2fdcdc66c9df7f5f77..7137b0bd77c304d8f4c65e32416963df12121420 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',
|
|
|