diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-06-07 13:10:35 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-06-07 13:10:35 +0100 |
| commit | e60cc6b8d7050c924609a24b7e8ad699382cf2b8 (patch) | |
| tree | 21b5d3b00dea028f92c663c76696f8cb19bab150 | |
| parent | a29ef94024f2792f44cd54f11e1f2fde148f122c (diff) | |
| download | rabbitmq-server-e60cc6b8d7050c924609a24b7e8ad699382cf2b8.tar.gz | |
Another version, avoiding a temp var
| -rw-r--r-- | Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -20,7 +20,6 @@ MANPAGES=$(patsubst %.xml, %.gz, $(wildcard $(DOCS_DIR)/*.[0-9].xml)) WEB_MANPAGES=$(patsubst %.xml, %.man.xml, $(wildcard $(DOCS_DIR)/*.[0-9].xml) $(DOCS_DIR)/rabbitmq-service.xml) USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML))) -TMP_TEST_OUT=/tmp/rabbitmq-server-test-output ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes) PYTHON=python @@ -163,10 +162,8 @@ run-node: all ./scripts/rabbitmq-server run-tests: all - echo "rabbit_tests:all_tests()." | $(ERL_CALL) | \ - tee $(TMP_TEST_OUT) | tail -n 1 | \ - grep '^{ok, passed}$$' > /dev/null && rm $(TMP_TEST_OUT) || \ - (cat $(TMP_TEST_OUT) && echo && rm $(TMP_TEST_OUT) && false) + OUT=$$(echo "rabbit_tests:all_tests()." | $(ERL_CALL)) ; \ + echo $$OUT ; echo $$OUT | grep '^{ok, passed}$$' > /dev/null start-background-node: $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ |