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

Move under enable_google_benchmarks targets that rely on the benchmarks

Browse Source 
Some targets depends on targets under enable_google_benchmarks. But they
are not under such if statement themeself.

Bug: webrtc:12404
Change-Id: I7c0b9a75bd3fa18090ef6a44fda22ed5f33d79b0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/204063
Commit-Queue: Andrey Logvin <landrey@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33104}
This commit is contained in:
Andrey Logvin 2021-01-29 10:34:55 +00:00 committed by Commit Bot
parent 133c0524f3
commit 5e227abfe9
4 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BUILD.gn
View File

@ -14,6 +14,7 @@
import("//build/config/linux/pkg_config.gni") import("//build/config/linux/pkg_config.gni")
import("//build/config/sanitizers/sanitizers.gni") import("//build/config/sanitizers/sanitizers.gni")
import("//third_party/google_benchmark/buildconfig.gni")
import("webrtc.gni") import("webrtc.gni")
if (rtc_enable_protobuf) { if (rtc_enable_protobuf) {
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
@ -584,12 +585,14 @@ if (rtc_include_tests) {
} }
} }
rtc_test("benchmarks") { if (enable_google_benchmarks) {
testonly = true rtc_test("benchmarks") {
deps = [ testonly = true
"rtc_base/synchronization:mutex_benchmark", deps = [
"test:benchmark_main", "rtc_base/synchronization:mutex_benchmark",
] "test:benchmark_main",
]
}
} }
# This runs tests that must run in real time and therefore can take some # This runs tests that must run in real time and therefore can take some

5
rtc_base/BUILD.gn
View File

@ -8,6 +8,7 @@
import("//build/config/crypto.gni") import("//build/config/crypto.gni")
import("//build/config/ui.gni") import("//build/config/ui.gni")
import("//third_party/google_benchmark/buildconfig.gni")
import("../webrtc.gni") import("../webrtc.gni")
if (is_android) { if (is_android) {
@ -1539,11 +1540,13 @@ if (rtc_include_tests) {
"../test:test_support", "../test:test_support",
"memory:fifo_buffer", "memory:fifo_buffer",
"synchronization:mutex", "synchronization:mutex",
"synchronization:synchronization_unittests",
"task_utils:pending_task_safety_flag", "task_utils:pending_task_safety_flag",
"task_utils:to_queued_task", "task_utils:to_queued_task",
"third_party/sigslot", "third_party/sigslot",
] ]
if (enable_google_benchmarks) {
deps += [ "synchronization:synchronization_unittests" ]
}
if (is_win) { if (is_win) {
sources += [ sources += [
"win32_unittest.cc", "win32_unittest.cc",

57
rtc_base/synchronization/BUILD.gn
View File

@ -6,6 +6,7 @@
# in the file PATENTS. All contributing project authors may # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
import("//third_party/google_benchmark/buildconfig.gni")
import("../../webrtc.gni") import("../../webrtc.gni")
if (is_android) { if (is_android) {
import("//build/config/android/config.gni") import("//build/config/android/config.gni")
@ -73,34 +74,36 @@ rtc_library("yield_policy") {
} }
if (rtc_include_tests) { if (rtc_include_tests) {
rtc_library("synchronization_unittests") { if (enable_google_benchmarks) {
testonly = true rtc_library("synchronization_unittests") {
sources = [ testonly = true
"mutex_unittest.cc", sources = [
"yield_policy_unittest.cc", "mutex_unittest.cc",
] "yield_policy_unittest.cc",
deps = [ ]
":mutex", deps = [
":yield", ":mutex",
":yield_policy", ":yield",
"..:checks", ":yield_policy",
"..:macromagic", "..:checks",
"..:rtc_base", "..:macromagic",
"..:rtc_event", "..:rtc_base",
"..:threading", "..:rtc_event",
"../../test:test_support", "..:threading",
"//third_party/google_benchmark", "../../test:test_support",
] "//third_party/google_benchmark",
} ]
}
rtc_library("mutex_benchmark") { rtc_library("mutex_benchmark") {
testonly = true testonly = true
sources = [ "mutex_benchmark.cc" ] sources = [ "mutex_benchmark.cc" ]
deps = [ deps = [
":mutex", ":mutex",
"../system:unused", "../system:unused",
"//third_party/google_benchmark", "//third_party/google_benchmark",
] ]
}
} }
rtc_library("sequence_checker_unittests") { rtc_library("sequence_checker_unittests") {

11
test/BUILD.gn
View File

@ -7,6 +7,7 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
import("//build/config/ui.gni") import("//build/config/ui.gni")
import("//third_party/google_benchmark/buildconfig.gni")
import("../webrtc.gni") import("../webrtc.gni")
if (is_android) { if (is_android) {
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
@ -445,11 +446,13 @@ if (rtc_include_tests) {
] ]
} }
rtc_library("benchmark_main") { if (enable_google_benchmarks) {
testonly = true rtc_library("benchmark_main") {
sources = [ "benchmark_main.cc" ] testonly = true
sources = [ "benchmark_main.cc" ]
deps = [ "//third_party/google_benchmark" ] deps = [ "//third_party/google_benchmark" ]
}
} }
rtc_library("test_support_test_artifacts") { rtc_library("test_support_test_artifacts") {