[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm@xxxxxxxxxxxxxx]

commit a28c14aad547fd1b254bdbf2acc1ff2b67551a96
Merge: 64c3c6a79 b40f9967f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Aug 29 11:17:31 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 Makefile.am      | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 08cb8e3e7,34493765d..dcb445c97
--- a/Makefile.am
+++ b/Makefile.am
@@@ -118,19 -118,18 +118,20 @@@ test-network: need-chutney-path $(TESTI
  
  # Run all available tests using automake's test-driver
  # only run IPv6 tests if we can ping6 ::1 (localhost)
 +# only run IPv6 tests if we can ping ::1 (localhost)
  # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011)
  # only run mixed tests if we have a tor-stable binary
 -# Try both the BSD and the Linux ping6 syntax, because they're incompatible
 +# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6,
 +# 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)."; \
 +	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)."; \
  		flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
  	else \
 -		echo "ping6 ::1 failed, skipping IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +		echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \
  		skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
  	fi; \
  	if command -v tor-stable >/dev/null 2>&1; then \

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits