aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-02 10:19:29 -0400
committerNick Mathewson <nickm@torproject.org>2017-11-02 10:19:29 -0400
commit3aab8307a57c668c24dae17b94f780b3f6783c67 (patch)
tree8f7d76808b276365e6436f95291e08131f76db6a /src/test
parent8687d9cf441514977e93e774dfe29a6f3816dcfc (diff)
parenta2bc979d9d498954e1a2955ce917781caed80634 (diff)
downloadtor-3aab8307a57c668c24dae17b94f780b3f6783c67.tar.gz
tor-3aab8307a57c668c24dae17b94f780b3f6783c67.zip
Merge branch 'ticket23820_032_01_squashed' into maint-0.3.2
Diffstat (limited to 'src/test')
-rw-r--r--src/test/include.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am
index 50cee693ab..7300b85412 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -42,8 +42,10 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \
single-onion-v23
# 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 flavor
TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6 \
- single-onion-v23-ipv6
+ single-onion-ipv6
# only run if we can find a stable (or simply another) version of tor
TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23