nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 07:33:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.8'

Browse Source
This commit is contained in:
David Goulet 2024-11-19 11:05:03 -05:00
commit 89e5e03dd5
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile.am
View File

@ -380,10 +380,9 @@ test-network-clean:
# #
# Run the IPv4 tests in $(ipv4_flavors), unconditionally # Run the IPv4 tests in $(ipv4_flavors), unconditionally
# - tor relays and directory authorities require IPv4. # - tor relays and directory authorities require IPv4.
# Run the IPv6 tests in $(ipv6_flavors), if IPv6 is available # Run the IPv6 tests in $(ipv6_flavors), unconditionally
# - only run IPv6 tests if we can ping6 or ping -6 ::1 (localhost) # - clients don't technically require IPv6, but it's not worth
# we try the syntax for BSD ping6, Linux ping6, and Linux ping -6, # supporting running this test suite on such systems.
# because they're incompatible
# - some IPv6 tests may fail without an IPv6 DNS server # - some IPv6 tests may fail without an IPv6 DNS server
# (see #16971 and #17011) # (see #16971 and #17011)
# Run the mixed tests in $(mixed_flavors), if a tor-stable binary is available # Run the mixed tests in $(mixed_flavors), if a tor-stable binary is available
@ -400,25 +399,9 @@ test-network-run: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/
echo "Running IPv4 flavors: $(ipv4_flavors)."; \ echo "Running IPv4 flavors: $(ipv4_flavors)."; \
flavors="$$flavors $(ipv4_flavors)"; \ flavors="$$flavors $(ipv4_flavors)"; \
fi; \ fi; \
test_network_ipv6=false; \
if test -n "$(ipv6_flavors)" || \
test -n "$(ipv6_mixed_flavors)"; then \
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 \
test_network_ipv6=true; \
fi; \
fi; \
if test -n "$(ipv6_flavors)"; then \ if test -n "$(ipv6_flavors)"; then \
if test "$$test_network_ipv6" = "true"; then \ echo "Running IPv6 flavors: $(ipv6_flavors)."; \
echo "ping6 ::1 or ping ::1 succeeded, running IPv6" \
"flavors: $(ipv6_flavors)."; \
flavors="$$flavors $(ipv6_flavors)"; \ flavors="$$flavors $(ipv6_flavors)"; \
else \
echo "ping6 ::1 and ping ::1 failed, skipping IPv6" \
"flavors: $(ipv6_flavors)."; \
skip_flavors="$$skip_flavors $(ipv6_flavors)"; \
fi; \
fi; \ fi; \
test_network_mixed=false; \ test_network_mixed=false; \
if test -n "$(mixed_flavors)" || \ if test -n "$(mixed_flavors)" || \
@ -439,8 +422,7 @@ test-network-run: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/
fi; \ fi; \
fi; \ fi; \
if test -n "$(ipv6_mixed_flavors)"; then \ if test -n "$(ipv6_mixed_flavors)"; then \
if test "$$test_network_ipv6" = "true" && \ if test "$$test_network_mixed" = "true"; then \
test "$$test_network_mixed" = "true"; then \
echo "Running IPv6 mixed flavors:" \ echo "Running IPv6 mixed flavors:" \
"$(ipv6_mixed_flavors)."; \ "$(ipv6_mixed_flavors)."; \
flavors="$$flavors $(ipv6_mixed_flavors)"; \ flavors="$$flavors $(ipv6_mixed_flavors)"; \

3
changes/testing Normal file
View File

@ -0,0 +1,3 @@
o Minor feature (testing):
- test-network now unconditionally includes IPv6 instead of trying to
detect IPv6 support.