aboutsummaryrefslogtreecommitdiff
path: root/src/test/include.am
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2020-02-13 11:57:36 +1000
committerteor <teor@torproject.org>2020-02-13 13:00:15 +1000
commit9d352028e60fa5b2b239f6ce0803c2b1b0cb5d84 (patch)
treed97060df663a24071a1659a8c9fa799886f8b02d /src/test/include.am
parentc33ffe013bd84d6246a2a9e59ccb82a599b89030 (diff)
downloadtor-9d352028e60fa5b2b239f6ce0803c2b1b0cb5d84.tar.gz
tor-9d352028e60fa5b2b239f6ce0803c2b1b0cb5d84.zip
Makefike: Add an IPv6 test to test-network
The IPv6 test only runs if IPv6 is available. Also, explicitly use the bridges+hs-v2 network for the IPv4-only test. This network was chutney's default as of January 2020. Closes 33300.
Diffstat (limited to 'src/test/include.am')
-rw-r--r--src/test/include.am10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am
index 90e50752ce..47e8d8fb09 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -61,11 +61,21 @@ 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
+
+# run a quick test or two
+# this test only uses IPv4
+TEST_CHUTNEY_FLAVOR_QUICK = bridges+hs-v2
+# only run if we can ping6 ::1 (localhost)
+TEST_CHUTNEY_FLAVOR_QUICK_IPV6 = client-ipv6-only-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
+
# only run if we can ping6 ::1 (localhost)
TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
single-onion-v23-ipv6-md
+
# only run if we can find a stable (or simply another) version of tor
TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2