Merge pull request #11438 from rabbitmq/loic-make-make-maker2

Fix make regressions from "Making make better"

Author: lhoguin

deps/rabbit_common/mk/rabbitmq-run.mk

@@ -165,8 +165,15 @@ virgin-node-tmpdir:
 ifdef LEAVE_PLUGINS_DISABLED
 RABBITMQ_ENABLED_PLUGINS ?=
 else
+# When running "make -C deps/plugin run-broker" we only want
+# "plugin" to be enabled. See rabbitmq-components.mk for where
+# this variable comes from.
+ifdef deps_dir_overriden
+RABBITMQ_ENABLED_PLUGINS ?= $(filter-out rabbit,$(PROJECT))
+else
 RABBITMQ_ENABLED_PLUGINS ?= ALL
 endif
+endif
 
 # --------------------------------------------------------------------
 # Run a full RabbitMQ.

deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl

@@ -743,6 +743,7 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
       {"RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=+S 2 +sbwt very_short +A 24 ~ts", [AdditionalErlArgs]},
       "RABBITMQ_LOG=debug",
       "RMQCTL_WAIT_TIMEOUT=180",
+      "FAST_RUN_BROKER=0",
       {"TEST_TMPDIR=~ts", [PrivDir]}
       | ExtraArgs],
     Cmd = ["start-background-broker" | MakeVars],