Skip to content

Commit

Permalink
rabbit/BUILD.bazel: resolve conflicts, bazel run gazelle
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelklishin committed Apr 19, 2023
1 parent 2aaf217 commit c1c450b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
17 changes: 6 additions & 11 deletions deps/rabbit/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -762,12 +762,12 @@ rabbitmq_suite(

rabbitmq_suite(
name = "rabbit_stream_sac_coordinator_SUITE",
deps = [
"//deps/rabbit_common:erlang_app",
],
runtime_deps = [
"@meck//:erlang_app",
],
deps = [
"//deps/rabbit_common:erlang_app",
],
)

rabbitmq_integration_suite(
Expand Down Expand Up @@ -1017,15 +1017,10 @@ rabbitmq_integration_suite(
rabbitmq_integration_suite(
name = "vhost_SUITE",
size = "medium",
<<<<<<< HEAD
flaky = True,
additional_srcs = [
"test/test_rabbit_event_handler.erl",
=======
additional_beam = [
"test/test_rabbit_event_handler.beam",
>>>>>>> 8de8f59d47 (Use gazelle generated bazel files)
],
flaky = True,
)

rabbitmq_suite(
Expand Down Expand Up @@ -1116,8 +1111,8 @@ rabbitmq_integration_suite(
rabbitmq_integration_suite(
name = "runtime_parameters_SUITE",
size = "small",
additional_srcs = [
"test/dummy_runtime_parameters.erl",
additional_beam = [
"test/dummy_runtime_parameters.beam",
],
)

Expand Down
7 changes: 7 additions & 0 deletions deps/rabbit/app.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1207,3 +1207,10 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
erlc_opts = "//:test_erlc_opts",
deps = ["//deps/amqp_client:erlang_app"],
)
erlang_bytecode(
name = "runtime_parameters_SUITE_beam_files",
testonly = True,
srcs = ["test/runtime_parameters_SUITE.erl"],
outs = ["test/runtime_parameters_SUITE.beam"],
erlc_opts = "//:test_erlc_opts",
)
1 change: 0 additions & 1 deletion moduleindex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,6 @@ rabbit:
- rabbit_cuttlefish
- rabbit_db
- rabbit_db_binding
- rabbit_db_cluster
- rabbit_db_exchange
- rabbit_db_maintenance
- rabbit_db_msup
Expand Down

0 comments on commit c1c450b

Please sign in to comment.