Makefile: Tweak the test-network* chuttney networks

In "make test-network", add tests for single onion services v2 and v3.

In "make test-network-all", test onion services v2 and v3 in the same
network.

Part of 33334.

diff --git a/src/test/include.am b/src/test/include.am
index 302771374bbafb49852eeda9968e01e8f0e12a80..9eb8dc2ab10798ed83c3185361a391cfdc5814a1 100644 (file)
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -66,11 +66,10 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
 # this test only uses IPv4
 TEST_CHUTNEY_FLAVOR_QUICK = bridges+hs-v23
 # only run if we can ping6 ::1 (localhost)
-TEST_CHUTNEY_FLAVOR_QUICK_IPV6 = client-ipv6-only-md
+TEST_CHUTNEY_FLAVOR_QUICK_IPV6 = single-onion-v23-ipv6-md
 
 # run a basic set of tests, which only use IPv4
-TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \
-       single-onion-v23
+TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v23-min single-onion-v23
 
 # only run if we can ping ::1 (localhost)
 TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \