commit 08e872ef51be562dc5f7c59d6e46d7f6006b3dd7 parent 3e54c985a25719814c27912ee1c116ecfb5854c1 Author: Jim Newsome <jnewsome@torproject.org> Date: Mon, 18 Nov 2024 10:26:26 -0600 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. Diffstat:
| M | Makefile.am | | | 17 | +++-------------- |
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git 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)"; \