summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor2345@gmail.com>2016-09-14 12:17:10 +1000
committerteor <teor2345@gmail.com>2016-09-14 12:17:10 +1000
commit16085a8421119cd2bb3aa022bd8ae3080fab4ae6 (patch)
tree1433f1f76afa8382690fea95aad0bd5a97a26c1d
parentb488bd54ba2055dbc01f7e7cfeca0d5d2d3990da (diff)
downloadtor-16085a8421119cd2bb3aa022bd8ae3080fab4ae6.tar.gz
tor-16085a8421119cd2bb3aa022bd8ae3080fab4ae6.zip
Add some chutney single onion networks to make test-network-all
This requires a recent version of chutney, with the single onion network flavours (git c72a652 or later). Closes ticket #20072.
-rw-r--r--changes/feature200725
-rw-r--r--src/test/include.am5
2 files changed, 8 insertions, 2 deletions
diff --git a/changes/feature20072 b/changes/feature20072
new file mode 100644
index 0000000000..1afabca5a3
--- /dev/null
+++ b/changes/feature20072
@@ -0,0 +1,5 @@
+ o Minor feature (testing, hidden services, ipv6):
+ - Add the single-onion and single-onion-ipv6 chutney targets to
+ make test-network-all. This requires a recent chutney version
+ with the single onion network flavours (git c72a652 or later).
+ Closes ticket 20072; patch by teor.
diff --git a/src/test/include.am b/src/test/include.am
index 0aff395091..5bcc969cf0 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -28,9 +28,10 @@ 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
+TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-min single-onion
# only run if we can ping6 ::1 (localhost)
-TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-ipv6
+TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-ipv6 \
+ single-onion-ipv6
# only run if we can find a stable (or simply another) version of tor
TEST_CHUTNEY_FLAVORS_MIXED = mixed