From 3e298633ca212447b4a230b970a293ce694ed3bb Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 24 Aug 2018 10:20:30 +1000 Subject: [PATCH 1/2] 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 f06d0e3734..b19a4bf966 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 \ From 541b89b061455a167e73e6fc61e9df7ee82f4525 Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 24 Aug 2018 10:25:25 +1000 Subject: [PATCH 2/2] Test: avoid spurious failures in make test-network-all Before running make test-network-all, delete old logs and test result files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc. --- Makefile.am | 1 + changes/bug27295 | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 changes/bug27295 diff --git a/Makefile.am b/Makefile.am index b19a4bf966..e4be3f26f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert # Try both the BSD and the Linux ping6 syntax, because they're incompatible test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) + rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log $(TEST_NETWORK_ALL_LOG_DIR)/*.trs @flavors="$(TEST_CHUTNEY_FLAVORS)"; \ if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1; then \ echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ diff --git a/changes/bug27295 b/changes/bug27295 new file mode 100644 index 0000000000..c5a364877a --- /dev/null +++ b/changes/bug27295 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing, chutney): + - Before running make test-network-all, delete old logs and test result + files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.