diff --git a/Makefile.am b/Makefile.am index 552b75a35f..c58140ae74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,6 +127,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert # 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 || ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \ echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ @@ -150,7 +151,7 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/ $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_WARNING_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 \ 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.