[tor-commits] [tor/master] make test-network-all exit 1 if any test network fails

[nickm@xxxxxxxxxxxxxx]

commit 60c6debda86e2ff6255f588d6b8e4e204a821bda
Author: teor (Tim Wilson-Brown) <teor2345@xxxxxxxxx>
Date:   Wed Sep 9 03:06:01 2015 +1000

    make test-network-all exit 1 if any test network fails
---
 Makefile.am |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 68695ed..c226113 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,8 +118,9 @@ test-network-all: need-chutney-path all test-driver
 	done; \
 	for f in $$flavors; do \
 		./test-driver --test-name $$f --log-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) $(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
-	done
-	@echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."
+	done; \
+	echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \
+	! grep -q FAIL test_network_log/*.trs
 
 need-stem-path:
 	@if test ! -d "$$STEM_SOURCE_DIR"; then \



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits