summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-09-22 16:53:39 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-09-22 16:53:39 +0100
commit6d31dab784c185864a115b390b3cd2f4d10a706f (patch)
tree154e9332cbbbceeccacd93954b123ff072b1e087
parent178af6f5d42519a6b8da99fafa22820b3752aebb (diff)
parent93263e17fd0d480586ede590d91254f333a1ced2 (diff)
downloadrabbitmq-server-6d31dab784c185864a115b390b3cd2f4d10a706f.tar.gz
Merge bug 26378
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index babcbe1e..a9dc10d5 100644
--- a/Makefile
+++ b/Makefile
@@ -111,8 +111,7 @@ ifneq "$(DEFAULT_GOAL_MAKE)" "$(firstword $(sort $(DEFAULT_GOAL_MAKE) $(MAKE_VER
.DEFAULT_GOAL=all
endif
-all: $(TARGETS)
-test-all: $(TEST_TARGETS)
+all: $(TARGETS) $(TEST_TARGETS)
.PHONY: plugins check-xref
ifneq "$(PLUGINS_SRC_DIR)" ""
@@ -229,7 +228,7 @@ run-background-node: all
RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \
./scripts/rabbitmq-server
-run-tests: all test-all
+run-tests: all
echo 'code:add_path("$(TEST_EBIN_DIR)").' | $(ERL_CALL)
echo 'code:add_path("$(TEST_EBIN_DIR)").' | $(ERL_CALL) -n hare || true
OUT=$$(echo "rabbit_tests:all_tests()." | $(ERL_CALL)) ; \