diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-09-02 15:52:05 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-09-02 15:52:05 +0200 |
| commit | 69485f86e1b1c95ebf41bed250042864b6cc8e48 (patch) | |
| tree | ca1283c3d3b7bb5df37c7df7c854e227f8b2638f | |
| parent | 9cbdc60b62085d71ff359f8d00363cc7fd44a651 (diff) | |
| parent | 1e3c0b48edee2fdd4ed713faabf4ee5521ea7e59 (diff) | |
| download | rabbitmq-server-git-69485f86e1b1c95ebf41bed250042864b6cc8e48.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | rabbitmq-components.mk | 14 |
2 files changed, 6 insertions, 12 deletions
@@ -5,6 +5,7 @@ VERSION ?= $(call get_app_version,src/$(PROJECT).app.src) PACKAGES_DIR ?= $(abspath PACKAGES) DEPS = ranch lager $(PLUGINS) +TEST_DEPS = amqp_client meck proper define usage_xml_to_erl $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, src/rabbit_%_usage.erl, $(subst -,_,$(1)))) @@ -68,9 +69,6 @@ DEPS += $(DISTRIBUTED_DEPS) endif endif -# FIXME: Remove rabbitmq_test as TEST_DEPS from here for now. -TEST_DEPS := amqp_client meck proper $(filter-out rabbitmq_test,$(TEST_DEPS)) - include erlang.mk # -------------------------------------------------------------------- diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index eb9e9e3e03..e3417856f8 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -123,7 +123,6 @@ RABBITMQ_COMPONENTS = amqp_client \ rabbitmq_shovel \ rabbitmq_shovel_management \ rabbitmq_stomp \ - rabbitmq_test \ rabbitmq_toke \ rabbitmq_top \ rabbitmq_tracing \ @@ -262,10 +261,13 @@ prepare-dist:: ifneq ($(PROJECT),rabbit) ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS)),) RUN_RMQ_TARGETS = run-broker \ + run-tls-broker \ run-background-broker \ run-node \ run-background-node \ - start-background-node + start-background-node \ + start-background-broker \ + start-rabbit-on-node ifneq ($(filter $(RUN_RMQ_TARGETS),$(MAKECMDGOALS)),) BUILD_DEPS += rabbit @@ -273,18 +275,12 @@ endif endif ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS) $(TEST_DEPS)),) -ifneq ($(filter check tests tests-with-broker test,$(MAKECMDGOALS)),) +ifneq ($(filter check tests,$(MAKECMDGOALS)),) TEST_DEPS += rabbit endif endif endif -ifeq ($(filter rabbit_public_umbrella amqp_client rabbit_common rabbitmq_test,$(PROJECT)),) -ifeq ($(filter rabbitmq_test,$(DEPS) $(BUILD_DEPS) $(TEST_DEPS)),) -TEST_DEPS += rabbitmq_test -endif -endif - # -------------------------------------------------------------------- # rabbitmq-components.mk checks. # -------------------------------------------------------------------- |