[tor-commits] [tor/master] Add v3 hidden service support to make test-network-all

[nickm at torproject.org]

commit d7d8d2c20e7e18016fce7e3b71de205b2471e3c5
Author: teor <teor2345 at gmail.com>
Date:   Tue Sep 12 17:08:28 2017 +1000

    Add v3 hidden service support to make test-network-all
    
    Requires chutney master 50f64ea or later.
    
    Implements ticket 22437.
---
 src/test/include.am | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/test/include.am b/src/test/include.am
index d1488057e..ced16c0a8 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -39,12 +39,13 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
 	$(TESTSCRIPTS)
 
 # These flavors are run using automake's test-driver and test-network.sh
-TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-min single-onion
+TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \
+	single-onion-v23
 # only run if we can ping6 ::1 (localhost)
-TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-ipv6 \
-	single-onion-ipv6
+TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6 \
+	single-onion-v23-ipv6
 # only run if we can find a stable (or simply another) version of tor
-TEST_CHUTNEY_FLAVORS_MIXED = mixed
+TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23
 
 ### This is a lovely feature, but it requires automake >= 1.12, and Tor
 ###  doesn't require that yet.