commit 2c15a065973e25d62628d1339131e1cd1eefcc8a Merge: 7fa11a9 5cd5979 Author: Nick Mathewson nickm@torproject.org Date: Mon May 9 18:14:54 2016 -0400

Merge branch 'maint-0.2.8'

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

diff --cc Makefile.am index 3c80290,cd88264..13ba00d --- a/Makefile.am +++ b/Makefile.am @@@ -101,10 -101,10 +101,10 @@@ test-network: need-chutney-path $(TESTI # 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 # see #17015 for autodetection of different tor versions -test-network-all: need-chutney-path all test-driver +test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) @flavors="$(TEST_CHUTNEY_FLAVORS)"; \ - if ping6 -q -o ::1 >/dev/null 2>&1; then \ + if ping6 -q -c 1 -o ::1 >/dev/null 2>&1; then \ echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \ else \