Skip to content

Implicitly add :gtest and :gtest_main dependencies to cf_cc_test targets #2408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Databean merged 1 commit into from
Apr 16, 2026
Merged

Implicitly add :gtest and :gtest_main dependencies to cf_cc_test targets #2408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion base/cvd/cuttlefish/bazel/rules.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,16 @@ cf_cc_library = macro(
implementation = _cf_cc_library_implementation,
)

def _cf_cc_test_implementation(name, clang_tidy_enabled, copts, **kwargs):
def _cf_cc_test_implementation(name, clang_tidy_enabled, copts, deps, **kwargs):
if not clang_tidy_enabled and not kwargs["deprecation"]:
kwargs["deprecation"] = "Not covered by clang-tidy"
cc_test(
name = name,
copts = (copts or []) + COPTS,
deps = deps + [
"@googletest//:gtest",
"@googletest//:gtest_main",
],
**kwargs,
)
if clang_tidy_enabled:
Expand All @@ -91,6 +95,7 @@ cf_cc_test = macro(
attrs = {
"clang_tidy_enabled": attr.bool(configurable = False, default = True, doc = "Decide if a corresponding clang_tidy_test target is generated"),
"copts": attr.string_list(configurable = False, default = []),
"deps": attr.label_list(configurable = False),
},
implementation = _cf_cc_test_implementation,
)
2 changes: 0 additions & 2 deletions base/cvd/cuttlefish/common/libs/fs/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ cf_cc_test(
deps = [
":fs",
"//libbase",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down
2 changes: 0 additions & 2 deletions base/cvd/cuttlefish/common/libs/key_equals_value/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@ cf_cc_test(
"//cuttlefish/common/libs/key_equals_value",
"//cuttlefish/result",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)
16 changes: 1 addition & 15 deletions base/cvd/cuttlefish/common/libs/utils/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ cf_cc_test(
"//cuttlefish/common/libs/utils:base64",
"//cuttlefish/result:result_matchers",
"//cuttlefish/result:result_type",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down Expand Up @@ -142,8 +140,6 @@ cf_cc_test(
"//cuttlefish/result",
"//cuttlefish/result:result_matchers",
"//libbase",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down Expand Up @@ -175,8 +171,6 @@ cf_cc_test(
"//cuttlefish/result",
"//cuttlefish/result:result_matchers",
"//libbase",
"@googletest//:gtest",
"@googletest//:gtest_main",
"@libxml2",
],
)
Expand Down Expand Up @@ -251,11 +245,7 @@ cf_cc_library(
cf_cc_test(
name = "network_test",
srcs = ["network_test.cpp"],
deps = [
":network",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
deps = [":network"],
)

cf_cc_library(
Expand All @@ -280,8 +270,6 @@ cf_cc_test(
"//cuttlefish/common/libs/utils:contains",
"//cuttlefish/common/libs/utils:proc_file_utils",
"//cuttlefish/result",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down Expand Up @@ -437,8 +425,6 @@ cf_cc_test(
"//cuttlefish/result",
"//libbase",
"@abseil-cpp//absl/log:check",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down
2 changes: 0 additions & 2 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,6 @@ cf_cc_test(
"//cuttlefish/io",
"//cuttlefish/io:in_memory",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down
2 changes: 0 additions & 2 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/android_build/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ cf_cc_test(
"//cuttlefish/host/commands/assemble_cvd/android_build:fake_android_build",
"//cuttlefish/result",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down
4 changes: 0 additions & 4 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ cf_cc_test(
"//cuttlefish/io:read_window_view",
"//cuttlefish/io:string",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down Expand Up @@ -93,7 +91,5 @@ cf_cc_test(
"//cuttlefish/io:read_window_view",
"//cuttlefish/io:string",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)
2 changes: 0 additions & 2 deletions base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ cf_cc_test(
deps = [
"//cuttlefish/host/commands/cvd/cli:frontline_parser",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down
6 changes: 0 additions & 6 deletions base/cvd/cuttlefish/host/commands/cvd/cli/parser/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ cf_cc_test(
"//cuttlefish/host/commands/cvd/cli/parser:cf_configs_common",
"//cuttlefish/host/commands/cvd/cli/parser:test_common",
"//libbase",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -93,8 +91,6 @@ cf_cc_test(
deps = [
"//cuttlefish/host/commands/cvd/cli/parser:test_common",
"//libbase",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down Expand Up @@ -180,8 +176,6 @@ cf_cc_test(
"//cuttlefish/result",
"//cuttlefish/result:result_matchers",
"//libbase",
"@googletest//:gtest",
"@googletest//:gtest_main",
"@jsoncpp",
],
)
Expand Down
8 changes: 0 additions & 8 deletions base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ cf_cc_test(
srcs = ["boot_configs_test.cc"],
deps = [
"//cuttlefish/host/commands/cvd/cli/parser:test_common",
"@googletest//:gtest",
"@googletest//:gtest_main",
"@jsoncpp",
],
)
Expand Down Expand Up @@ -107,8 +105,6 @@ cf_cc_test(
srcs = ["disk_configs_test.cc"],
deps = [
"//cuttlefish/host/commands/cvd/cli/parser:test_common",
"@googletest//:gtest",
"@googletest//:gtest_main",
"@jsoncpp",
],
)
Expand All @@ -123,8 +119,6 @@ cf_cc_test(
"//cuttlefish/host/commands/assemble_cvd:launch_cvd_cc_proto",
"//cuttlefish/host/commands/cvd/cli/parser:test_common",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
"@jsoncpp",
"@protobuf",
"@protobuf//:differencer",
Expand All @@ -139,8 +133,6 @@ cf_cc_test(
"//cuttlefish/host/commands/cvd/cli/parser:test_common",
"//cuttlefish/result:result_matchers",
"//libbase",
"@googletest//:gtest",
"@googletest//:gtest_main",
"@jsoncpp",
],
)
6 changes: 0 additions & 6 deletions base/cvd/cuttlefish/host/commands/cvd/cli/selector/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ cf_cc_test(
"//cuttlefish/common/libs/utils:environment",
"//cuttlefish/host/commands/cvd/cli/commands:host_tool_target",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -69,8 +67,6 @@ cf_cc_test(
"//cuttlefish/host/commands/cvd/cli/selector:parser_ids_helper",
"//cuttlefish/host/commands/cvd/cli/selector:start_selector_parser",
"//libbase",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -95,8 +91,6 @@ cf_cc_test(
"//cuttlefish/host/commands/cvd/cli/selector:selector_common_parser",
"//cuttlefish/host/commands/cvd/cli/selector:start_selector_parser",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down
4 changes: 0 additions & 4 deletions base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@ cf_cc_test(
"//cuttlefish/result:result_matchers",
"//libbase",
"@fmt",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down Expand Up @@ -239,8 +237,6 @@ cf_cc_test(
"//cuttlefish/host/commands/cvd/fetch:fetch_cvd_parser",
"//cuttlefish/result",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down
10 changes: 1 addition & 9 deletions base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ cf_cc_test(
"//cuttlefish/host/commands/cvd/instances",
"//cuttlefish/host/commands/cvd/instances:instance_database_helper",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down Expand Up @@ -145,19 +143,13 @@ cf_cc_test(
"//cuttlefish/host/commands/cvd/instances",
"//cuttlefish/host/commands/cvd/instances:cvd_persistent_data",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

cf_cc_test(
name = "local_instance_test",
srcs = ["local_instance_test.cpp"],
deps = [
"//cuttlefish/host/commands/cvd/instances",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
deps = ["//cuttlefish/host/commands/cvd/instances"],
)

cf_cc_library(
Expand Down
2 changes: 0 additions & 2 deletions base/cvd/cuttlefish/host/commands/cvd_import_locations/unittest/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,5 @@ cf_cc_test(
"//cuttlefish/host/libs/location",
"//cuttlefish/host/libs/location:string_parse",
"//libbase",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)
6 changes: 1 addition & 5 deletions base/cvd/cuttlefish/host/commands/cvd_send_id_disclosure/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,5 @@ cf_cc_test(
srcs = [
"unittest/cellular_identifier_disclosure_command_builder_test.cc",
],
deps = [
":libcvd_id_disclosure_builder",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
deps = [":libcvd_id_disclosure_builder"],
)
2 changes: 0 additions & 2 deletions base/cvd/cuttlefish/host/commands/cvd_send_sms/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,5 @@ cf_cc_test(
"//cuttlefish/common/libs/fs",
"//libbase",
"@abseil-cpp//absl/log:check",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)
6 changes: 1 addition & 5 deletions base/cvd/cuttlefish/host/commands/cvd_update_security_algorithm/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,5 @@ cf_cc_test(
srcs = [
"unittest/update_security_algorithm_command_builder_test.cc",
],
deps = [
":libcvd_update_security_algorithm_builder",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
deps = [":libcvd_update_security_algorithm_builder"],
)
6 changes: 1 addition & 5 deletions base/cvd/cuttlefish/host/commands/metrics/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,5 @@ cf_cc_library(
cf_cc_test(
name = "utils_test",
srcs = ["utils_tests.cpp"],
deps = [
"//cuttlefish/host/commands/metrics:utils",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
deps = ["//cuttlefish/host/commands/metrics:utils"],
)
14 changes: 2 additions & 12 deletions base/cvd/cuttlefish/host/commands/modem_simulator/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ cf_cc_library(
cf_cc_test(
name = "command_parser_test",
srcs = ["unittest/command_parser_test.cpp"],
deps = [
"//cuttlefish/host/commands/modem_simulator:command_parser",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
deps = ["//cuttlefish/host/commands/modem_simulator:command_parser"],
)

cf_cc_library(
Expand Down Expand Up @@ -213,11 +209,7 @@ cf_cc_library(
cf_cc_test(
name = "pdu_parser_test",
srcs = ["unittest/pdu_parser_test.cpp"],
deps = [
"//cuttlefish/host/commands/modem_simulator:pdu_parser",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
deps = ["//cuttlefish/host/commands/modem_simulator:pdu_parser"],
)

cf_cc_test(
Expand All @@ -239,8 +231,6 @@ cf_cc_test(
"@abseil-cpp//absl/log",
"@abseil-cpp//absl/strings",
"@gflags",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down
2 changes: 0 additions & 2 deletions base/cvd/cuttlefish/host/libs/config/adb/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,5 @@ cf_cc_test(
"//cuttlefish/host/libs/config:config_flag",
"//cuttlefish/host/libs/feature",
"@fruit",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)
2 changes: 0 additions & 2 deletions base/cvd/cuttlefish/host/libs/web/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ cf_cc_test(
"//cuttlefish/host/libs/web:android_build_string",
"//cuttlefish/result",
"//cuttlefish/result:result_matchers",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand Down
Loading
Loading