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 | bd1302a37fea363ab6e85054604830b4cf00d4cf (patch) | |
| tree | 50327ef780088f42a653ecf4fb01d67f548a514b | |
| parent | 4acfc8d4b296807ef3b5e7b2b157a40666f81baa (diff) | |
| parent | b40f9967fa31faa1dcf1a977989e235fbe836015 (diff) | |
| download | tor-bd1302a37fea363ab6e85054604830b4cf00d4cf.tar.gz tor-bd1302a37fea363ab6e85054604830b4cf00d4cf.zip | |
Merge branch 'maint-0.3.2' into release-0.3.2
| -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 4d2d9d222a..34493765df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,6 +123,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)."; \ @@ -146,7 +147,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. |