admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Relanding: Remove rtc_p2p_unittests from ortc_unittests and rtc_media_unittests

Browse Source 
These tests are already built into rtc_unittests, so they end up being
run three times. Fixed by creating a "p2p_test_utils" target that
contains the test utils that ortc_unittests and rtc_media_unittests
depend on, but not the tests themselves.

BUG=None
TBR=kjellander@webrtc.org

Review-Url: https://codereview.webrtc.org/2820263004
Cr-Commit-Position: refs/heads/master@{#17752}
This commit is contained in:
deadbeef 2017-04-18 15:49:09 -07:00 committed by Commit bot
parent 60c10cb925
commit 59edb9298e
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/media/BUILD.gn
View File

@ -452,7 +452,7 @@ if (rtc_include_tests) {
"../modules/audio_processing:audio_processing",
"../modules/video_coding:video_coding_utility",
"../modules/video_coding:webrtc_vp8",
"../p2p:rtc_p2p_unittests",
"../p2p:p2p_test_utils",
"../system_wrappers:metrics_default",
"../test:audio_codec_mocks",
"../test:test_support",

2
webrtc/ortc/BUILD.gn
View File

@ -78,8 +78,8 @@ if (rtc_include_tests) {
"../base:rtc_base_approved",
"../base:rtc_base_tests_utils",
"../media:rtc_unittest_main",
"../p2p:p2p_test_utils",
"../p2p:rtc_p2p",
"../p2p:rtc_p2p_unittests",
"../pc:pc_test_utils",
"../system_wrappers:metrics_default",
]

31
webrtc/p2p/BUILD.gn
View File

@ -142,18 +142,37 @@ rtc_static_library("rtc_p2p") {
}
if (rtc_include_tests) {
rtc_source_set("rtc_p2p_unittests") {
rtc_source_set("p2p_test_utils") {
testonly = true
sources = [
"base/asyncstuntcpsocket_unittest.cc",
"base/dtlstransportchannel_unittest.cc",
"base/fakedtlstransport.h",
"base/fakeicetransport.h",
"base/fakepackettransport.h",
"base/fakeportallocator.h",
"base/faketransportcontroller.h",
"base/jseptransport_unittest.cc",
"base/mockicetransport.h",
"base/testrelayserver.h",
"base/teststunserver.h",
"base/testturnserver.h",
]
deps = [
":rtc_p2p",
"//testing/gmock",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_source_set("rtc_p2p_unittests") {
testonly = true
sources = [
"base/asyncstuntcpsocket_unittest.cc",
"base/dtlstransportchannel_unittest.cc",
"base/jseptransport_unittest.cc",
"base/p2ptransportchannel_unittest.cc",
"base/packetlossestimator_unittest.cc",
"base/port_unittest.cc",
@ -166,9 +185,6 @@ if (rtc_include_tests) {
"base/stunrequest_unittest.cc",
"base/stunserver_unittest.cc",
"base/tcpport_unittest.cc",
"base/testrelayserver.h",
"base/teststunserver.h",
"base/testturnserver.h",
"base/transportcontroller_unittest.cc",
"base/transportdescriptionfactory_unittest.cc",
"base/turnport_unittest.cc",
@ -186,6 +202,7 @@ if (rtc_include_tests) {
]
}
deps = [
":p2p_test_utils",
":rtc_p2p",
"../api:fakemetricsobserver",
"//testing/gmock",