diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-10-19 10:24:24 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-10-19 10:24:24 -0400 |
| commit | a9913435bc66e5f0ec539c9ce6f72a3e52aa4f08 (patch) | |
| tree | 5bb9f02aa97b84bdda286940d5fa4f4b871c962c /src/test/include.am | |
| parent | bc106b9e168730efa406b209acc7625c9c2e0133 (diff) | |
| parent | 44e105c27f9ff7ce1fb62b09bac30679382c8d67 (diff) | |
| download | tor-a9913435bc66e5f0ec539c9ce6f72a3e52aa4f08.tar.gz tor-a9913435bc66e5f0ec539c9ce6f72a3e52aa4f08.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/test/include.am b/src/test/include.am index 75861fb9ef..c13c5f2c2d 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -51,15 +51,12 @@ TESTS += 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-v2-min hs-v3-min \ - single-onion-v23 +TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v3-min single-onion-v3 # only run if we can ping6 ::1 (localhost) -# IPv6-only v3 single onion services don't work yet, so we don't test the -# single-onion-v23-ipv6-md flavor -TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ - single-onion-ipv6-md +# IPv6-only v3 single onion services don't work yet. +TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v3-ipv6 # only run if we can find a stable (or simply another) version of tor -TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2 +TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v3 ### This is a lovely feature, but it requires automake >= 1.12, and Tor ### doesn't require that yet. |