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

Make bwe_simulator a separate test target that doesnt run on the bots

Browse Source 
but remove the #if BWE_TEST_LOGGING_COMPILE_TIME_ENABLE so that it always builds.

BUG=webrtc:6497

Review-Url: https://codereview.webrtc.org/2398123002
Cr-Commit-Position: refs/heads/master@{#14564}
This commit is contained in:
terelius 2016-10-07 00:39:56 -07:00 committed by Commit bot
parent 23345594e0
commit 3dcfd64c26
4 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/BUILD.gn
View File

@ -718,7 +718,7 @@ if (rtc_include_tests) {
"modules/audio_coding:neteq_test_support", "modules/audio_coding:neteq_test_support",
"modules/audio_processing", "modules/audio_processing",
"modules/audio_processing:audioproc_test_utils", "modules/audio_processing:audioproc_test_utils",
"modules/remote_bitrate_estimator:bwe_simulator", "modules/remote_bitrate_estimator:bwe_simulator_lib",
"modules/rtp_rtcp", "modules/rtp_rtcp",
"test:test_common", "test:test_common",
"test:test_main", "test:test_main",

36
webrtc/modules/BUILD.gn
View File

@ -627,7 +627,6 @@ if (rtc_include_tests) {
"../test:rtp_test_utils", "../test:rtp_test_utils",
"../test:test_common", "../test:test_common",
"../test:test_support_main", "../test:test_support_main",
"../test:test_support_main",
"../test:video_test_common", "../test:video_test_common",
"audio_coding", "audio_coding",
"audio_coding:acm_receive_test", "audio_coding:acm_receive_test",
@ -650,7 +649,7 @@ if (rtc_include_tests) {
"media_file", "media_file",
"pacing", "pacing",
"remote_bitrate_estimator", "remote_bitrate_estimator",
"remote_bitrate_estimator:bwe_simulator", "remote_bitrate_estimator:bwe_simulator_lib",
"rtp_rtcp", "rtp_rtcp",
"utility", "utility",
"video_capture", "video_capture",
@ -705,4 +704,37 @@ if (rtc_include_tests) {
ldflags = [ "-ObjC" ] ldflags = [ "-ObjC" ]
} }
} }
rtc_test("bwe_simulator") {
testonly = true
deps = []
sources = [
"remote_bitrate_estimator/bwe_simulations.cc",
]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
if (is_win) {
cflags = [
# TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
"/wd4373", # virtual function override.
]
}
deps += [
"..:webrtc_common",
"../base:rtc_base_approved",
"../test:test_common",
"../test:test_support_main",
"remote_bitrate_estimator:bwe_simulator_lib",
"video_capture",
"//testing/gmock",
"//testing/gtest",
"//third_party/gflags",
]
}
} }

3
webrtc/modules/remote_bitrate_estimator/BUILD.gn
View File

@ -52,10 +52,9 @@ rtc_static_library("remote_bitrate_estimator") {
} }
if (rtc_include_tests) { if (rtc_include_tests) {
rtc_static_library("bwe_simulator") { rtc_static_library("bwe_simulator_lib") {
testonly = true testonly = true
sources = [ sources = [
"bwe_simulations.cc",
"test/bwe.cc", "test/bwe.cc",
"test/bwe.h", "test/bwe.h",
"test/bwe_test.cc", "test/bwe_test.cc",

3
webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
View File

@ -22,7 +22,7 @@
namespace webrtc { namespace webrtc {
namespace testing { namespace testing {
namespace bwe { namespace bwe {
#if BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
// This test fixture is used to instantiate tests running with adaptive video // This test fixture is used to instantiate tests running with adaptive video
// senders. // senders.
class BweSimulation : public BweTest, class BweSimulation : public BweTest,
@ -445,7 +445,6 @@ TEST_P(BweSimulation, GccComparisonChoke) {
gcc_test.RunChoke(kFullSendSideEstimator, capacities_kbps); gcc_test.RunChoke(kFullSendSideEstimator, capacities_kbps);
} }
#endif // BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
} // namespace bwe } // namespace bwe
} // namespace testing } // namespace testing
} // namespace webrtc } // namespace webrtc