Merge branch 'stable'

Author: dumbbell

.gitignore

@@ -2,6 +2,7 @@
 .sw?
 .*.sw?
 *.beam
+*.coverdata
 .erlang.mk/
 cover/
 debug/
@@ -12,6 +13,7 @@ ebin/
 etc/
 logs/
 plugins/
+test/ct.cover.spec
 
 PACKAGES/
 

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
 
 # --------------------------------------------------------------------
@@ -101,24 +106,6 @@ clean:: clean-extra-sources
 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.
 # --------------------------------------------------------------------