From: Jim Newsome <jnewsome@torproject.org>
Date: Mon, 18 Nov 2024 16:26:26 +0000 (-0600)
Subject: test-network-run: refactor away test_network_ipv6
X-Git-Tag: tor-0.4.9.1-alpha~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08e872ef51be562dc5f7c59d6e46d7f6006b3dd7;p=thirdparty%2Ftor.git

test-network-run: refactor away test_network_ipv6

This should be a pure refactor to simplify the logic a bit now that we
no longer probe for IPv6 support.
---

diff --git a/Makefile.am b/Makefile.am
index c475ee3a17..ed43ec72fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -399,19 +399,9 @@ test-network-run: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/
 		echo "Running IPv4 flavors: $(ipv4_flavors)."; \
 		flavors="$$flavors $(ipv4_flavors)"; \
 	fi; \
-	test_network_ipv6=false; \
-	if test -n "$(ipv6_flavors)" || \
-	   test -n "$(ipv6_mixed_flavors)"; then \
-		test_network_ipv6=true; \
-	fi; \
 	if test -n "$(ipv6_flavors)"; then \
-		if test "$$test_network_ipv6" = "true"; then \
-			echo "Running IPv6 flavors: $(ipv6_flavors)."; \
-			flavors="$$flavors $(ipv6_flavors)"; \
-		else \
-			echo "Skipping IPv6 flavors: $(ipv6_flavors)."; \
-			skip_flavors="$$skip_flavors $(ipv6_flavors)"; \
-		fi; \
+		echo "Running IPv6 flavors: $(ipv6_flavors)."; \
+		flavors="$$flavors $(ipv6_flavors)"; \
 	fi; \
 	test_network_mixed=false; \
 	if test -n "$(mixed_flavors)" || \
@@ -432,8 +422,7 @@ test-network-run: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/
 		fi; \
 	fi; \
 	if test -n "$(ipv6_mixed_flavors)"; then \
-		if test "$$test_network_ipv6" = "true" && \
-		   test "$$test_network_mixed" = "true"; then \
+		if test "$$test_network_mixed" = "true"; then \
 			echo "Running IPv6 mixed flavors:" \
 			  "$(ipv6_mixed_flavors)."; \
 			flavors="$$flavors $(ipv6_mixed_flavors)"; \