summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2019-11-27 19:45:48 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2019-11-27 19:45:48 +0100
commitb772a9ceaff671d05df3f66b532dafd8e5156183 (patch)
tree1cc2b762fb143336f2d5dccaa6b6881e0465835a
parentddc9878a6fab26001325bc162eb58818cee4c357 (diff)
downloadrabbitmq-server-git-b772a9ceaff671d05df3f66b532dafd8e5156183.tar.gz
feature_flags_SUITE: Just set the extra plugin path
rabbit_ct_broker_helpers will take care of prepending the regular plugins path.
-rw-r--r--test/feature_flags_SUITE.erl8
1 files changed, 1 insertions, 7 deletions
diff --git a/test/feature_flags_SUITE.erl b/test/feature_flags_SUITE.erl
index 097114d08c..25c4a93a54 100644
--- a/test/feature_flags_SUITE.erl
+++ b/test/feature_flags_SUITE.erl
@@ -879,13 +879,7 @@ activating_plugin_with_new_ff_enabled(Config) ->
build_my_plugin(Config) ->
PluginSrcDir = filename:join(?config(data_dir, Config), "my_plugin"),
- PluginsDir1 = filename:join(?config(current_srcdir, Config), "plugins"),
- PluginsDir2 = filename:join(PluginSrcDir, "plugins"),
- PathSep = case os:type() of
- {win32, _} -> ";";
- _ -> ":"
- end,
- PluginsDir = PluginsDir1 ++ PathSep ++ PluginsDir2,
+ PluginsDir = filename:join(PluginSrcDir, "plugins"),
Config1 = rabbit_ct_helpers:set_config(Config,
[{rmq_plugins_dir, PluginsDir}]),
case filelib:wildcard("plugins/my_plugin-*", PluginSrcDir) of