[tor-commits] [tor/maint-0.3.3] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

nickm at torproject.org nickm at torproject.org
Wed Aug 29 15:17:35 UTC 2018


commit 3e298633ca212447b4a230b970a293ce694ed3bb
Author: teor <teor at torproject.org>
Date:   Fri Aug 24 10:20:30 2018 +1000

    Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am
    
    Part of 27295.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f06d0e373..b19a4bf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/
 		$(SHELL) $(top_srcdir)/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)."; \
-	! grep -q FAIL test_network_log/*.trs
+	! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
 
 need-stem-path:
 	@if test ! -d "$$STEM_SOURCE_DIR"; then \





More information about the tor-commits mailing list