diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-09-30 15:02:13 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-09-30 15:02:13 +0100 |
| commit | 7c1668e5c06a94fc8f08628daede462da66a93ec (patch) | |
| tree | afe3a894ed10ef87ffd70e034d9344ae791ba449 /Makefile | |
| parent | 84407908c2d6cffc57097734627e9f5182bed632 (diff) | |
| parent | f7a0cb7577bdb6edb5ce591018e06a5ed44ab307 (diff) | |
| download | rabbitmq-server-git-7c1668e5c06a94fc8f08628daede462da66a93ec.tar.gz | |
Merging default into bug24455
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -173,6 +173,12 @@ run-node: all RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \ ./scripts/rabbitmq-server +run-background-node: all + $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ + RABBITMQ_NODE_ONLY=true \ + RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \ + ./scripts/rabbitmq-server + run-tests: all OUT=$$(echo "rabbit_tests:all_tests()." | $(ERL_CALL)) ; \ echo $$OUT ; echo $$OUT | grep '^{ok, passed}$$' > /dev/null @@ -180,14 +186,15 @@ run-tests: all run-qc: all $(foreach MOD,$(QC_MODULES),./quickcheck $(RABBITMQ_NODENAME) $(MOD) $(QC_TRIALS)) -start-background-node: - $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ - RABBITMQ_NODE_ONLY=true \ - RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \ - ./scripts/rabbitmq-server; sleep 1 +start-background-node: all + -rm -f $(RABBITMQ_MNESIA_DIR).pid + mkdir -p $(RABBITMQ_MNESIA_DIR) + setsid sh -c "$(MAKE) run-background-node > $(RABBITMQ_MNESIA_DIR)/startup_log 2> $(RABBITMQ_MNESIA_DIR)/startup_err" & + sleep 1 start-rabbit-on-node: all echo "rabbit:start()." | $(ERL_CALL) + ./scripts/rabbitmqctl -n $(RABBITMQ_NODENAME) wait $(RABBITMQ_MNESIA_DIR).pid stop-rabbit-on-node: all echo "rabbit:stop()." | $(ERL_CALL) |