From 85c698da72ef3737e7c209732b2a9b892c9273fa Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 9 May 2016 18:12:59 -0400 Subject: [PATCH] Add "-c 1" to ping6 in test-network-all Fixes bug 19008. bugfix on 0.2.7.3-rc --- Makefile.am | 2 +- changes/bug19008 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changes/bug19008 diff --git a/Makefile.am b/Makefile.am index beea69d95..6fd94058e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,7 @@ test-network: need-chutney-path all test-network-all: need-chutney-path all test-driver 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 \ diff --git a/changes/bug19008 b/changes/bug19008 new file mode 100644 index 000000000..c51c98faa --- /dev/null +++ b/changes/bug19008 @@ -0,0 +1,3 @@ + o Major bugfixes (testing): + - Fix a bug that would block 'make test-network-all' on systems + where IPv6 packets were lost. Fixes bug 19008; bugfix on tor-0.2.7.3-rc.