diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-29 11:17:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-29 11:17:31 -0400 |
| commit | 6b3b59ad7cc4596f57fa73e1a0355f6e937bd516 (patch) | |
| tree | d91d85fe06af9e09545fbd89c9ad74132dafede2 | |
| parent | 71f84c93b059ca440ae7e428cb8c34b25c1d2a77 (diff) | |
| parent | a28c14aad547fd1b254bdbf2acc1ff2b67551a96 (diff) | |
| download | tor-6b3b59ad7cc4596f57fa73e1a0355f6e937bd516.tar.gz tor-6b3b59ad7cc4596f57fa73e1a0355f6e937bd516.zip | |
Merge branch 'maint-0.3.3' into release-0.3.3
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | changes/bug27295 | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 08cb8e3e7e..dcb445c970 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,6 +125,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)."; \ @@ -148,7 +149,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. |