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

rabbit_ct_broker_helpers: Prepend regular plugins dir to `rmq_plugins_dir` 

`rmp_plugins_dir` is set by testsuites to indicate an extra plugins
directory now (instead of the full value of `$RABBITMQ_PLUGINS_DIR`).

This helps when we are using a secondary Umbrella: the testsuite does
not have to mess with the computation of the regular plugins directory.
This commit is contained in:
Jean-Sébastien Pédron 2019-11-27 19:38:54 +01:00
parent b7f4134066
commit e354b1e95d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl vendored
View File

@ -615,8 +615,16 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
end,
ExtraArgs0 = [],
ExtraArgs1 = case rabbit_ct_helpers:get_config(Config, rmq_plugins_dir) of
undefined -> ExtraArgs0;
Dir -> [{"RABBITMQ_PLUGINS_DIR=~s", [Dir]}
undefined ->
ExtraArgs0;
ExtraPluginsDir ->
PathSep = case os:type() of
{win32, _} -> ";";
_ -> ":"
end,
RegularPluginsDir = filename:join(SrcDir, "plugins"),
[{"RABBITMQ_PLUGINS_DIR=~s~s~s",
[RegularPluginsDir, PathSep, ExtraPluginsDir]}
| ExtraArgs0]
end,
StartWithPluginsDisabled = rabbit_ct_helpers:get_config(