summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--changes/bug190083
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 92ba2b868d..cd88264264 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,7 +104,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 0000000000..c51c98faa6
--- /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.