Merge remote-tracking branch 'teor/feature20072'

This commit is contained in:
Nick Mathewson 2016-09-14 10:18:41 -04:00
commit 8b7922b282
2 changed files with 8 additions and 2 deletions

5
changes/feature20072 Normal file
View file

@ -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.

View file

@ -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