aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2020-02-17 13:49:23 +1000
committerteor <teor@torproject.org>2020-02-17 13:49:23 +1000
commitf231827946764c664fbfe7c8ddef2b88d7b6f105 (patch)
tree8fa11576b6dcfe311c5345bb9010d398822db9ba /src
parenta6509cb86744f8f20bd522c744aecf88474a039f (diff)
parent8874d1c247cd05856621ddca00f3e8c55e6a5900 (diff)
downloadtor-f231827946764c664fbfe7c8ddef2b88d7b6f105.tar.gz
tor-f231827946764c664fbfe7c8ddef2b88d7b6f105.zip
Merge remote-tracking branch 'tor-github/pr/1731'
Diffstat (limited to 'src')
-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..fdd1195fdf 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-v23
+# 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