diff options
| author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-05-27 10:38:06 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-05-27 10:38:06 +0200 |
| commit | 41a512e8c01f27f776e84ec94319a3e8bbb9f390 (patch) | |
| tree | 6461b032af83c408d50324f482a56d64b7aa943e /Makefile | |
| parent | 1adb58bf81b030352b38c411c9a5b495e0067bb4 (diff) | |
| parent | 83643e45cc43a0f852cc60b27ca3e015635854ff (diff) | |
| download | rabbitmq-server-git-41a512e8c01f27f776e84ec94319a3e8bbb9f390.tar.gz | |
Merge branch 'rabbitmq-server-725' into stable
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 5 insertions, 14 deletions
@@ -25,6 +25,8 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-run.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. @@ -64,6 +66,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 # -------------------------------------------------------------------- @@ -106,22 +111,8 @@ clean-extra-sources: # Tests. # -------------------------------------------------------------------- -TARGETS_IN_RABBITMQ_TEST = $(patsubst %,%-in-rabbitmq_test,\ - tests full unit lite conformance16 lazy-vq-tests) - -.PHONY: $(TARGETS_IN_RABBITMQ_TEST) - TEST_ERLC_OPTS += $(RMQ_ERLC_OPTS) -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. # -------------------------------------------------------------------- |