commit da280a430906349fd697860fbe326de86eccd36d Author: teor teor@torproject.org Date: Mon Feb 17 14:50:24 2020 +1000

Makefile: Add an IPv6 mixed chutney network

This network is used in make test-network-all and test-network-ipv6.

Closes 33334. --- Makefile.am | 6 ++++-- changes/ticket33334 | 5 +++++ src/test/include.am | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am index 7e57570a0..028488565 100644 --- a/Makefile.am +++ b/Makefile.am @@ -317,7 +317,8 @@ test-network-all: @$(MAKE) test-network-run \ ipv4_flavors="$(TEST_CHUTNEY_FLAVORS)" \ mixed_flavors="$(TEST_CHUTNEY_FLAVORS_MIXED)" \ - ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" + ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" \ + ipv6_mixed_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6_MIXED)" @$(MAKE) test-network-results

# Run IPv4 and mixed tests using automake's test-driver @@ -338,7 +339,8 @@ test-network-ipv6: @$(MAKE) test-network-mkdir @$(MAKE) test-network-clean @$(MAKE) test-network-run \ - ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" + ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" \ + ipv6_mixed_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6_MIXED)" @$(MAKE) test-network-results

# Make the test network log directory, if it does not exist diff --git a/changes/ticket33334 b/changes/ticket33334 new file mode 100644 index 000000000..ada3cb284 --- /dev/null +++ b/changes/ticket33334 @@ -0,0 +1,5 @@ + o Testing: + - Test v3 onion services to tor's mixed IPv4 chutney network. And add a + mixed IPv6 chutney network. These networks are used in the + test-network-all, test-network-ipv4, and test-network-ipv6 make targets. + Closes ticket 33334. diff --git a/src/test/include.am b/src/test/include.am index 9b5376d87..302771374 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -79,6 +79,9 @@ TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ # only run if we can find a stable (or simply another) version of tor TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23

+# only run if IPv6 and mixed networks are run +TEST_CHUTNEY_FLAVORS_IPV6_MIXED = mixed+hs-v23-ipv6 + ### This is a lovely feature, but it requires automake >= 1.12, and Tor ### doesn't require that yet. ###