Skip to content

Commit

Permalink
Merge pull request redpanda-data#24792 from IoannisRP/ik-bazel-simpli…
Browse files Browse the repository at this point in the history 
…fy-bgtest

bazel: simplify btest/gtest split targets
  • Loading branch information
@IoannisRP
IoannisRP authored Jan 14, 2025
2 parents 64eca11 + 9d5ef44 commit 823066a
Show file tree
Hide file tree
Showing 12 changed files with 86 additions and 239 deletions.
143 changes: 32 additions & 111 deletions src/v/cloud_storage/tests/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ load(
)

redpanda_test_cc_library(
name = "s3_imposter_gtest",
name = "s3_imposter",
srcs = [
"s3_imposter.cc",
],
Expand All @@ -17,14 +17,14 @@ redpanda_test_cc_library(
"//src/v/base",
"//src/v/bytes:iobuf",
"//src/v/bytes:iobuf_parser",
"//src/v/test_utils:gtest",
],
include_prefix = "cloud_storage/tests",
visibility = ["//visibility:public"],
deps = [
"//src/v/cloud_storage_clients",
"//src/v/config",
"//src/v/http/tests:utils",
"//src/v/test_utils:fixture",
"//src/v/utils:uuid",
"@abseil-cpp//absl/container:flat_hash_set",
"@boost//:algorithm",
Expand All @@ -35,66 +35,22 @@ redpanda_test_cc_library(
)

redpanda_test_cc_library(
name = "s3_imposter_btest",
srcs = [
"s3_imposter.cc",
],
hdrs = [
"s3_imposter.h",
],
implementation_deps = [
"//src/v/base",
"//src/v/bytes:iobuf",
"//src/v/bytes:iobuf_parser",
"//src/v/test_utils:seastar_boost",
],
include_prefix = "cloud_storage/tests",
visibility = ["//visibility:public"],
deps = [
"//src/v/cloud_storage_clients",
"//src/v/config",
"//src/v/http/tests:utils",
"//src/v/utils:uuid",
"@abseil-cpp//absl/container:flat_hash_set",
"@boost//:algorithm",
"@boost//:core",
"@boost//:property_tree",
"@seastar",
],
)

redpanda_test_cc_library(
name = "read_replica_e2e_fixture_btest",
hdrs = [
"read_replica_e2e_fixture.h",
],
implementation_deps = [
],
include_prefix = "cloud_storage/tests",
deps = [
"//src/v/cloud_storage/tests:s3_imposter_btest",
"//src/v/redpanda/tests:fixture_btest",
"//src/v/test_utils:scoped_config",
],
)

redpanda_test_cc_library(
name = "read_replica_e2e_fixture_gtest",
name = "read_replica_e2e_fixture",
hdrs = [
"read_replica_e2e_fixture.h",
],
implementation_deps = [
],
include_prefix = "cloud_storage/tests",
deps = [
"//src/v/cloud_storage/tests:s3_imposter_gtest",
"//src/v/redpanda/tests:fixture_gtest",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/redpanda/tests:fixture",
"//src/v/test_utils:scoped_config",
],
)

redpanda_test_cc_library(
name = "common_btest",
name = "common",
srcs = ["util.cc"],
hdrs = [
"cache_test_fixture.h",
Expand All @@ -106,7 +62,7 @@ redpanda_test_cc_library(
],
include_prefix = "cloud_storage/tests",
deps = [
":s3_imposter_btest",
":s3_imposter",
"//src/v/base",
"//src/v/bytes:iobuf",
"//src/v/bytes:iostream",
Expand All @@ -117,12 +73,12 @@ redpanda_test_cc_library(
"//src/v/kafka/server/tests:kafka_test_utils",
"//src/v/model",
"//src/v/model/tests:random",
"//src/v/redpanda/tests:fixture_btest",
"//src/v/redpanda/tests:fixture",
"//src/v/storage",
"//src/v/storage:record_batch_utils",
"//src/v/storage/tests:disk_log_builder",
"//src/v/test_utils:fixture",
"//src/v/test_utils:scoped_config",
"//src/v/test_utils:seastar_boost",
"//src/v/utils:lazy_abort_source",
"//src/v/utils:stream_provider",
"@boost//:numeric_conversion",
Expand All @@ -131,55 +87,19 @@ redpanda_test_cc_library(
],
)

redpanda_test_cc_library(
name = "common_gtest",
srcs = ["util.cc"],
hdrs = [
"cache_test_fixture.h",
"cloud_storage_fixture.h",
"common_def.h",
"manual_fixture.h",
"produce_utils.h",
"util.h",
],
include_prefix = "cloud_storage/tests",
deps = [
":s3_imposter_gtest",
"//src/v/base",
"//src/v/bytes:iobuf",
"//src/v/bytes:iostream",
"//src/v/bytes:streambuf",
"//src/v/cloud_storage",
"//src/v/cluster",
"//src/v/cluster/cloud_metadata/tests:manual_mixin",
"//src/v/kafka/server/tests:kafka_test_utils",
"//src/v/model",
"//src/v/model/tests:random",
"//src/v/redpanda/tests:fixture_gtest",
"//src/v/storage",
"//src/v/storage:record_batch_utils",
"//src/v/storage/tests:disk_log_builder",
"//src/v/test_utils:gtest",
"//src/v/test_utils:scoped_config",
"//src/v/utils:lazy_abort_source",
"//src/v/utils:stream_provider",
"@boost//:numeric_conversion",
"@seastar",
],
)

redpanda_cc_btest(
name = "segment_meta_cstore_test",
timeout = "short",
srcs = [
"segment_meta_cstore_test.cc",
],
deps = [
":common_btest",
":common",
"//src/v/base",
"//src/v/cloud_storage",
"//src/v/model",
"//src/v/random:generators",
"//src/v/test_utils:seastar_boost",
"//src/v/utils:delta_for",
"//src/v/utils:human",
"@boost//:test",
Expand Down Expand Up @@ -246,12 +166,13 @@ redpanda_cc_btest(
"remote_segment_index_test.cc",
],
deps = [
":common_btest",
":common",
"//src/v/bytes:iobuf",
"//src/v/bytes:iostream",
"//src/v/cloud_storage",
"//src/v/model",
"//src/v/random:generators",
"//src/v/test_utils:seastar_boost",
"@boost//:test",
"@seastar",
"@seastar//:testing",
Expand Down Expand Up @@ -279,8 +200,8 @@ redpanda_cc_btest(
"materialized_manifest_cache_test.cc",
],
deps = [
":common_btest",
":s3_imposter_btest",
":common",
":s3_imposter",
"//src/v/bytes:iostream",
"//src/v/cloud_storage",
"//src/v/model",
Expand Down Expand Up @@ -336,7 +257,7 @@ redpanda_cc_gtest(
cpu = 1,
tags = ["exclusive"],
deps = [
":s3_imposter_gtest",
":s3_imposter",
"//src/v/cloud_storage",
"//src/v/cloud_storage_clients",
"//src/v/cluster:topic_configuration",
Expand Down Expand Up @@ -449,8 +370,8 @@ redpanda_cc_btest(
deps = [
"//src/v/bytes:iostream",
"//src/v/cloud_storage",
"//src/v/cloud_storage/tests:common_btest",
"//src/v/cloud_storage/tests:s3_imposter_btest",
"//src/v/cloud_storage/tests:common",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/test_utils:seastar_boost",
"//src/v/utils:lazy_abort_source",
"@boost//:test",
Expand All @@ -472,7 +393,7 @@ redpanda_cc_btest(
"//src/v/bytes:iobuf",
"//src/v/bytes:iostream",
"//src/v/cloud_storage",
"//src/v/cloud_storage/tests:common_btest",
"//src/v/cloud_storage/tests:common",
"//src/v/model",
"//src/v/storage",
"//src/v/test_utils:seastar_boost",
Expand All @@ -499,8 +420,8 @@ redpanda_cc_btest(
"//src/v/bytes:iobuf_parser",
"//src/v/bytes:iostream",
"//src/v/cloud_storage",
"//src/v/cloud_storage/tests:common_btest",
"//src/v/cloud_storage/tests:s3_imposter_btest",
"//src/v/cloud_storage/tests:common",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/cloud_storage_clients",
"//src/v/config",
"//src/v/model",
Expand All @@ -525,8 +446,8 @@ redpanda_cc_btest(
deps = [
"//src/v/bytes:iostream",
"//src/v/cloud_storage",
"//src/v/cloud_storage/tests:common_btest",
"//src/v/cloud_storage/tests:s3_imposter_btest",
"//src/v/cloud_storage/tests:common",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/model",
"//src/v/test_utils:seastar_boost",
"//src/v/utils:retry_chain_node",
Expand Down Expand Up @@ -571,7 +492,7 @@ redpanda_cc_gtest(
"//src/v/bytes:iostream",
"//src/v/bytes:streambuf",
"//src/v/cloud_storage",
"//src/v/cloud_storage/tests:s3_imposter_gtest",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/cloud_storage_clients",
"//src/v/model",
"//src/v/test_utils:gtest",
Expand All @@ -595,8 +516,8 @@ redpanda_cc_gtest(
"//src/v/bytes:iobuf_parser",
"//src/v/bytes:iostream",
"//src/v/cloud_storage",
"//src/v/cloud_storage/tests:common_gtest",
"//src/v/cloud_storage/tests:s3_imposter_gtest",
"//src/v/cloud_storage/tests:common",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/cloud_storage_clients",
"//src/v/config",
"//src/v/model",
Expand All @@ -623,7 +544,7 @@ redpanda_cc_gtest(
"//src/v/bytes:iostream",
"//src/v/bytes:streambuf",
"//src/v/cloud_storage",
"//src/v/cloud_storage/tests:s3_imposter_gtest",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/cloud_storage_clients",
"//src/v/model",
"//src/v/test_utils:gtest",
Expand All @@ -643,15 +564,15 @@ redpanda_cc_gtest(
tags = ["exclusive"],
deps = [
"//src/v/cloud_storage",
"//src/v/cloud_storage/tests:common_gtest",
"//src/v/cloud_storage/tests:s3_imposter_gtest",
"//src/v/cloud_storage/tests:common",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/cluster",
"//src/v/cluster/tests:topic_properties_generator",
"//src/v/config",
"//src/v/kafka/server/tests:kafka_test_utils",
"//src/v/model",
"//src/v/redpanda:application",
"//src/v/redpanda/tests:fixture_gtest",
"//src/v/redpanda/tests:fixture",
"//src/v/test_utils:gtest",
"//src/v/test_utils:scoped_config",
"//src/v/utils:retry_chain_node",
Expand All @@ -671,8 +592,8 @@ redpanda_cc_btest(
tags = ["exclusive"],
deps = [
"//src/v/cloud_storage",
"//src/v/cloud_storage/tests:common_btest",
"//src/v/cloud_storage/tests:s3_imposter_btest",
"//src/v/cloud_storage/tests:common",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/model",
"//src/v/test_utils:seastar_boost",
"@boost//:test",
Expand Down
2 changes: 1 addition & 1 deletion src/v/cluster/tests/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ redpanda_test_cc_library(
include_prefix = "cluster/tests",
deps = [
"//src/v/cluster",
"//src/v/raft/tests:simple_raft_fixture_btest",
"//src/v/raft/tests:simple_raft_fixture",
],
)

Expand Down
2 changes: 1 addition & 1 deletion src/v/datalake/coordinator/tests/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ redpanda_cc_gtest(
":state_test_utils",
"//src/v/cloud_io:remote",
"//src/v/cloud_io/tests:scoped_remote",
"//src/v/cloud_storage/tests:s3_imposter_gtest",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/datalake:logger",
"//src/v/datalake:table_definition",
"//src/v/datalake/coordinator:iceberg_file_committer",
Expand Down
4 changes: 2 additions & 2 deletions src/v/datalake/tests/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ redpanda_test_cc_library(
deps = [
"//src/v/cloud_io:remote",
"//src/v/cloud_io/tests:scoped_remote",
"//src/v/cloud_storage/tests:s3_imposter_gtest",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/iceberg:filesystem_catalog",
"//src/v/schema/tests:fake_registry",
],
Expand Down Expand Up @@ -147,7 +147,7 @@ redpanda_cc_gtest(
deps = [
"//src/v/cloud_io:remote",
"//src/v/cloud_io/tests:scoped_remote",
"//src/v/cloud_storage/tests:s3_imposter_gtest",
"//src/v/cloud_storage/tests:s3_imposter",
"//src/v/datalake:catalog_schema_manager",
"//src/v/iceberg:datatypes",
"//src/v/iceberg:field_collecting_visitor",
Expand Down
Loading

0 comments on commit 823066a

Please sign in to comment.