summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile23
1 files changed, 5 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index fa03c3f9d1..781da8de80 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,8 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
rabbit_common/mk/rabbitmq-dist.mk \
rabbit_common/mk/rabbitmq-tools.mk
+CT_OPTS += -ct_hooks cth_surefire
+
# FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be
# reviewed and merged.
@@ -65,6 +67,9 @@ DEPS += $(DISTRIBUTED_DEPS)
endif
endif
+# FIXME: Remove rabbitmq_test as TEST_DEPS from here for now.
+TEST_DEPS := amqp_client meck $(filter-out rabbitmq_test,$(TEST_DEPS))
+
include erlang.mk
# --------------------------------------------------------------------
@@ -102,24 +107,6 @@ clean-extra-sources:
$(gen_verbose) rm -f $(EXTRA_SOURCES)
# --------------------------------------------------------------------
-# Tests.
-# --------------------------------------------------------------------
-
-TARGETS_IN_RABBITMQ_TEST = $(patsubst %,%-in-rabbitmq_test,\
- tests full unit lite conformance16 lazy-vq-tests)
-
-.PHONY: $(TARGETS_IN_RABBITMQ_TEST)
-
-tests:: tests-in-rabbitmq_test
-
-$(TARGETS_IN_RABBITMQ_TEST): $(ERLANG_MK_RECURSIVE_TEST_DEPS_LIST) \
- test-build $(DEPS_DIR)/rabbitmq_test
- $(MAKE) -C $(DEPS_DIR)/rabbitmq_test \
- IS_DEP=1 \
- RABBITMQ_BROKER_DIR=$(RABBITMQ_BROKER_DIR) \
- $(patsubst %-in-rabbitmq_test,%,$@)
-
-# --------------------------------------------------------------------
# Documentation.
# --------------------------------------------------------------------