|
@@ -117,17 +117,19 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert
|
|
|
|
|
|
# Run all available tests using automake's test-driver
|
|
# Run all available tests using automake's test-driver
|
|
# only run IPv6 tests if we can ping6 ::1 (localhost)
|
|
# only run IPv6 tests if we can ping6 ::1 (localhost)
|
|
|
|
+# only run IPv6 tests if we can ping ::1 (localhost)
|
|
# some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011)
|
|
# 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
|
|
# only run mixed tests if we have a tor-stable binary
|
|
-# Try both the BSD and the Linux ping6 syntax, because they're incompatible
|
|
|
|
|
|
+# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6,
|
|
|
|
+# because they're incompatible
|
|
test-network-all: need-chutney-path test-driver $(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)
|
|
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
|
|
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
|
|
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
|
|
- if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1; then \
|
|
|
|
- echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \
|
|
|
|
|
|
+ if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1 || ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \
|
|
|
|
+ echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \
|
|
flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
|
|
flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
|
|
else \
|
|
else \
|
|
- echo "ping6 ::1 failed, skipping IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \
|
|
|
|
|
|
+ echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \
|
|
skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
|
|
skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
|
|
fi; \
|
|
fi; \
|
|
if command -v tor-stable >/dev/null 2>&1; then \
|
|
if command -v tor-stable >/dev/null 2>&1; then \
|