make: Move rabbitmq-early-test.mk to rabbitmq-early-plugin.mk

No real need to have two files, especially since it contains
only a few variable definitions. Plan is to only keep
separate files for larger features such as dist or run.

Author: lhoguin

deps/amqp10_client/Makefile

@@ -33,7 +33,7 @@ DEPS = amqp10_common credentials_obfuscation
 TEST_DEPS = rabbit rabbitmq_ct_helpers
 LOCAL_DEPS = ssl inets crypto public_key
 
-DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
+DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
 	      rabbit_common/mk/rabbitmq-hexpm.mk \
 	      rabbit_common/mk/rabbitmq-dist.mk \

deps/amqp10_common/Makefile

@@ -38,7 +38,7 @@ TEST_DEPS = rabbitmq_ct_helpers proper
 
 -include development.pre.mk
 
-DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
+DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
 	      rabbit_common/mk/rabbitmq-hexpm.mk \
 	      rabbit_common/mk/rabbitmq-dist.mk

deps/amqp_client/Makefile

@@ -43,7 +43,7 @@ LOCAL_DEPS = xmerl ssl public_key
 DEPS = rabbit_common credentials_obfuscation
 TEST_DEPS = rabbitmq_ct_helpers rabbit meck
 
-DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
+DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
 	      rabbit_common/mk/rabbitmq-hexpm.mk \
 	      rabbit_common/mk/rabbitmq-dist.mk \

deps/oauth2_client/Makefile

@@ -9,7 +9,7 @@ LOCAL_DEPS = ssl inets crypto public_key
 
 PLT_APPS = rabbit
 
-DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
+DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
 	      rabbit_common/mk/rabbitmq-hexpm.mk \
 	      rabbit_common/mk/rabbitmq-dist.mk \

deps/rabbit/Makefile

@@ -154,7 +154,7 @@ MANPAGES     = $(wildcard $(DOCS_DIR)/*.[0-9])
 WEB_MANPAGES = $(patsubst %,%.html,$(MANPAGES))
 MD_MANPAGES  = $(patsubst %,%.md,$(MANPAGES))
 
-DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
+DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
 	      rabbit_common/mk/rabbitmq-dist.mk \
 	      rabbit_common/mk/rabbitmq-run.mk

deps/rabbit_common/Makefile

@@ -38,7 +38,7 @@ DEPS = thoas ranch recon credentials_obfuscation
 
 -include development.pre.mk
 
-DEP_EARLY_PLUGINS = $(PROJECT)/mk/rabbitmq-early-test.mk
+DEP_EARLY_PLUGINS = $(PROJECT)/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = $(PROJECT)/mk/rabbitmq-build.mk \
 	      $(PROJECT)/mk/rabbitmq-hexpm.mk \
 	      $(PROJECT)/mk/rabbitmq-dist.mk
@@ -52,7 +52,7 @@ HEX_TARBALL_FILES += rabbitmq-components.mk \
 		     git-revisions.txt \
 		     mk/rabbitmq-build.mk \
 		     mk/rabbitmq-dist.mk \
-		     mk/rabbitmq-early-test.mk \
+		     mk/rabbitmq-early-plugin.mk \
 		     mk/rabbitmq-hexpm.mk
 
 -include development.post.mk

deps/rabbit_common/mk/rabbitmq-early-plugin.mk

@@ -1,3 +1,57 @@
-ifeq ($(filter rabbitmq-early-test.mk,$(notdir $(MAKEFILE_LIST))),)
-include $(dir $(lastword $(MAKEFILE_LIST)))rabbitmq-early-test.mk
+# --------------------------------------------------------------------
+# dialyzer
+# --------------------------------------------------------------------
+
+DIALYZER_OPTS ?= -Werror_handling -Wunmatched_returns -Wunknown
+
+dialyze: ERL_LIBS = $(APPS_DIR):$(DEPS_DIR):$(DEPS_DIR)/rabbitmq_cli/_build/dev/lib:$(dir $(shell elixir --eval ":io.format '~s~n', [:code.lib_dir :elixir ]"))
+
+# --------------------------------------------------------------------
+# Common Test flags.
+# --------------------------------------------------------------------
+
+# We start the common_test node as a hidden Erlang node. The benefit
+# is that other Erlang nodes won't try to connect to each other after
+# discovering the common_test node if they are not meant to.
+#
+# This helps when several unrelated RabbitMQ clusters are started in
+# parallel.
+
+CT_OPTS += -hidden
+
+# Enable the following common_test hooks on GH and Concourse:
+#
+# cth_fail_fast
+#   This hook will make sure the first failure puts an end to the
+#   testsuites; ie. all remaining tests are skipped.
+#
+# cth_styledout
+#   This hook will change the output of common_test to something more
+#   concise and colored.
+
+CT_HOOKS ?= cth_styledout
+TEST_DEPS += cth_styledout
+
+ifdef CONCOURSE
+FAIL_FAST = 1
+SKIP_AS_ERROR = 1
+endif
+
+RMQ_CI_CT_HOOKS = cth_fail_fast
+ifeq ($(FAIL_FAST),1)
+CT_HOOKS += $(RMQ_CI_CT_HOOKS)
+TEST_DEPS += $(RMQ_CI_CT_HOOKS)
+endif
+
+dep_cth_fail_fast = git https://github.com/rabbitmq/cth_fail_fast.git master
+dep_cth_styledout = git https://github.com/rabbitmq/cth_styledout.git master
+
+CT_HOOKS_PARAM_VALUE = $(patsubst %,and %,$(CT_HOOKS))
+CT_OPTS += -ct_hooks $(wordlist 2,$(words $(CT_HOOKS_PARAM_VALUE)),$(CT_HOOKS_PARAM_VALUE))
+
+# On CI, set $RABBITMQ_CT_SKIP_AS_ERROR so that any skipped
+# testsuite/testgroup/testcase is considered an error.
+
+ifeq ($(SKIP_AS_ERROR),1)
+export RABBITMQ_CT_SKIP_AS_ERROR = true
 endif