Browse Source

Merge branch 'maint-0.2.8'

Nick Mathewson 8 years ago
parent
commit
2c15a06597
2 changed files with 4 additions and 1 deletions
  1. 1 1
      Makefile.am
  2. 3 0
      changes/bug19008

+ 1 - 1
Makefile.am

@@ -104,7 +104,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert
 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 \

+ 3 - 0
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.