root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

amqp_client system_SUITE apparently needs the cli on the code path 

I'm not actually sure why the changes to rabbitmqctl compilation
necessitated this change, but it seems to be the case
This commit is contained in:
Rin Kuryloski 2024-06-17 08:47:53 +02:00
parent ba8cf2c2f7
commit 662ad8edf4
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deps/amqp_client/BUILD.bazel vendored
View File

@ -107,6 +107,7 @@ rabbitmq_home(
name = "broker-for-tests-home", name = "broker-for-tests-home",
plugins = [ plugins = [
"//deps/rabbit:erlang_app", "//deps/rabbit:erlang_app",
"//deps/rabbitmq_cli:erlang_app",
], ],
) )

17
deps/rabbitmq_cli/BUILD.bazel vendored
View File

@ -88,11 +88,6 @@ APP_ENV = """[{scopes,[{'rabbitmq-plugins',plugins},
{'rabbitmq-upgrade',upgrade}, {'rabbitmq-upgrade',upgrade},
{'vmware-rabbitmq',vmware}]}]""" {'vmware-rabbitmq',vmware}]}]"""
EXTRA_APPS = [
"elixir",
"logger",
]
SRCS = glob([ SRCS = glob([
"lib/**/*.ex", "lib/**/*.ex",
]) ])
@ -137,8 +132,11 @@ app_file(
app_env = APP_ENV, app_env = APP_ENV,
app_name = APP_NAME, app_name = APP_NAME,
app_version = APP_VERSION, app_version = APP_VERSION,
extra_apps = EXTRA_APPS,
modules = [":beam_files"], modules = [":beam_files"],
deps = [
"@rules_elixir//elixir",
"@rules_elixir//elixir:logger",
],
) )
elixir_ebin_dir( elixir_ebin_dir(
@ -161,7 +159,6 @@ erlang_app_info(
hdrs = [], hdrs = [],
app_name = APP_NAME, app_name = APP_NAME,
beam = [":ebin"], beam = [":ebin"],
extra_apps = EXTRA_APPS,
license_files = glob(["LICENSE*"]), license_files = glob(["LICENSE*"]),
priv = [], priv = [],
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
@ -223,12 +220,15 @@ app_file(
app_env = APP_ENV, app_env = APP_ENV,
app_name = APP_NAME, app_name = APP_NAME,
app_version = APP_VERSION, app_version = APP_VERSION,
extra_apps = EXTRA_APPS,
modules = [":beam_files"], modules = [":beam_files"],
synthetic_module_names = [ synthetic_module_names = [
"Elixir." + name "Elixir." + name
for name in _TEST_MODULES for name in _TEST_MODULES
], ],
deps = [
"@rules_elixir//elixir",
"@rules_elixir//elixir:logger",
],
) )
elixir_ebin_dir( elixir_ebin_dir(
@ -246,7 +246,6 @@ erlang_app_info(
hdrs = [], hdrs = [],
app_name = APP_NAME, app_name = APP_NAME,
beam = [":test_ebin"], beam = [":test_ebin"],
extra_apps = EXTRA_APPS,
license_files = glob(["LICENSE*"]), license_files = glob(["LICENSE*"]),
priv = [], priv = [],
visibility = ["//visibility:public"], visibility = ["//visibility:public"],

2
rabbitmq_home.bzl
View File

@ -1,6 +1,6 @@
load("@rules_erlang//:ct.bzl", "additional_file_dest_relative_path")
load("@rules_erlang//:erlang_app_info.bzl", "ErlangAppInfo", "flat_deps") load("@rules_erlang//:erlang_app_info.bzl", "ErlangAppInfo", "flat_deps")
load("@rules_erlang//:util.bzl", "path_join") load("@rules_erlang//:util.bzl", "path_join")
load("@rules_erlang//:ct.bzl", "additional_file_dest_relative_path")
RabbitmqHomeInfo = provider( RabbitmqHomeInfo = provider(
doc = "An assembled RABBITMQ_HOME dir", doc = "An assembled RABBITMQ_HOME dir",