Use ping -6 ::1 on Linux when ping6 ::1 fails on tests.

Tor test now checks if "ping -6 -c 1 -W 1 ::1" works when "ping6 -c 1 -W 1 ::1"
fails on tests.

Fixes #24677; bugfix in 0.2.9.3-alpha.

Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index ad2ceb66a9cd3397092c58fde087a79e29bc3660..e92417cdaa4a6c99dda04eef2ca8449486bb639a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 # 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)
 # 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
        mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
        @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)"; \
        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)"; \
        fi; \
        if command -v tor-stable >/dev/null 2>&1; then \

diff --git a/changes/ticket24677 b/changes/ticket24677
new file mode 100644 (file)
index 0000000..5e6d551
--- /dev/null
+++ b/changes/ticket24677
@@ -0,0 +1,4 @@
+  o Minor bugfix (network IPv6 test):
+    - Tor test now checks if "ping -6 ::1" works when the user runs "make
+      test-network-all". Fixes bug 24677; bugfix on 0.2.9.3-alpha.
+      Patch by "ffmancera".