[tor-commits] [tor/release-0.2.7] Add "-c 1" to ping6 in test-network-all

[nickm at torproject.org]

commit 85c698da72ef3737e7c209732b2a9b892c9273fa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 9 18:12:59 2016 -0400

    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(-)

diff --git a/Makefile.am b/Makefile.am
index beea69d..6fd9405 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 0000000..c51c98f
--- /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.