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 | 5b072fd46982291cede10781f4aa0710d14d827d (patch) | |
| tree | c1e84d1c17dcc705398b31cd2e1cfcd875edb82b | |
| parent | 060f6f60792ca5c8062da3583cd281d827b7c5f7 (diff) | |
| parent | 541b89b061455a167e73e6fc61e9df7ee82f4525 (diff) | |
| download | tor-5b072fd46982291cede10781f4aa0710d14d827d.tar.gz tor-5b072fd46982291cede10781f4aa0710d14d827d.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -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 f06d0e3734..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)."; \ @@ -128,7 +129,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 \ 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. |