summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2016-09-02 15:52:05 +0200
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2016-09-02 15:52:05 +0200
commit69485f86e1b1c95ebf41bed250042864b6cc8e48 (patch)
treeca1283c3d3b7bb5df37c7df7c854e227f8b2638f /Makefile
parent9cbdc60b62085d71ff359f8d00363cc7fd44a651 (diff)
parent1e3c0b48edee2fdd4ed713faabf4ee5521ea7e59 (diff)
downloadrabbitmq-server-git-69485f86e1b1c95ebf41bed250042864b6cc8e48.tar.gz
Merge branch 'stable'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f30faaab74..fa6b82d02c 100644
--- a/Makefile
+++ b/Makefile
@@ -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
# --------------------------------------------------------------------