diff --git a/deps/rabbit_common/mk/rabbitmq-run.mk b/deps/rabbit_common/mk/rabbitmq-run.mk index eea9a00ca5..a30af51588 100644 --- a/deps/rabbit_common/mk/rabbitmq-run.mk +++ b/deps/rabbit_common/mk/rabbitmq-run.mk @@ -66,6 +66,7 @@ node_mnesia_base = $(call node_tmpdir,$(1))/mnesia node_mnesia_dir = $(call node_mnesia_base,$(1))/$(1) node_schema_dir = $(call node_tmpdir,$(1))/schema node_plugins_expand_dir = $(call node_tmpdir,$(1))/plugins +node_generated_config_dir = $(call node_tmpdir,$(1))/config node_enabled_plugins_file = $(call node_tmpdir,$(1))/enabled_plugins # Broker startup variables for the test environment. @@ -79,6 +80,7 @@ RABBITMQ_MNESIA_BASE ?= $(call node_mnesia_base,$(RABBITMQ_NODENAME_FOR_PATHS)) RABBITMQ_MNESIA_DIR ?= $(call node_mnesia_dir,$(RABBITMQ_NODENAME_FOR_PATHS)) RABBITMQ_SCHEMA_DIR ?= $(call node_schema_dir,$(RABBITMQ_NODENAME_FOR_PATHS)) RABBITMQ_PLUGINS_EXPAND_DIR ?= $(call node_plugins_expand_dir,$(RABBITMQ_NODENAME_FOR_PATHS)) +RABBITMQ_GENERATED_CONFIG_DIR ?= $(call node_generated_config_dir,$(RABBITMQ_NODENAME_FOR_PATHS)) RABBITMQ_ENABLED_PLUGINS_FILE ?= $(call node_enabled_plugins_file,$(RABBITMQ_NODENAME_FOR_PATHS)) # erlang.mk adds dependencies' ebin directory to ERL_LIBS. This is @@ -98,6 +100,7 @@ RABBITMQ_LOG_BASE="$(call node_log_base,$(2))" \ RABBITMQ_MNESIA_BASE="$(call node_mnesia_base,$(2))" \ RABBITMQ_MNESIA_DIR="$(call node_mnesia_dir,$(2))" \ RABBITMQ_SCHEMA_DIR="$(call node_schema_dir,$(2))" \ +RABBITMQ_GENERATED_CONFIG_DIR="$(call node_generated_config_dir,$(2))" \ RABBITMQ_PLUGINS_DIR="$(CURDIR)/$(DIST_DIR)" \ RABBITMQ_PLUGINS_EXPAND_DIR="$(call node_plugins_expand_dir,$(2))" \ RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" @@ -121,14 +124,16 @@ node-tmpdir: $(verbose) mkdir -p $(RABBITMQ_LOG_BASE) \ $(RABBITMQ_MNESIA_BASE) \ $(RABBITMQ_SCHEMA_DIR) \ - $(RABBITMQ_PLUGINS_EXPAND_DIR) + $(RABBITMQ_PLUGINS_EXPAND_DIR) \ + $(RABBITMQ_GENERATED_CONFIG_DIR) virgin-node-tmpdir: $(gen_verbose) rm -rf $(NODE_TMPDIR) $(verbose) mkdir -p $(RABBITMQ_LOG_BASE) \ $(RABBITMQ_MNESIA_BASE) \ $(RABBITMQ_SCHEMA_DIR) \ - $(RABBITMQ_PLUGINS_EXPAND_DIR) + $(RABBITMQ_PLUGINS_EXPAND_DIR) \ + $(RABBITMQ_GENERATED_CONFIG_DIR) .PHONY: test-tmpdir virgin-test-tmpdir node-tmpdir virgin-node-tmpdir