summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorteor (Tim Wilson-Brown) <teor2345@gmail.com>2015-09-08 22:27:59 +1000
committerteor (Tim Wilson-Brown) <teor2345@gmail.com>2015-09-08 22:27:59 +1000
commit5feae32f46b3f0cc3da93ece80163c1a994c83b9 (patch)
tree73302742fa8674b9f89c8951099470a977a499a7 /src/test
parent6b118e1e1e17888beb2d61525c326ddd6bfd7933 (diff)
downloadtor-5feae32f46b3f0cc3da93ece80163c1a994c83b9.tar.gz
tor-5feae32f46b3f0cc3da93ece80163c1a994c83b9.zip
Add "make test-network-all" to verify multiple test networks
make test-network-all is Makefile target which verifies a series of test networks generated using test-network.sh and chutney. It runs IPv6 and mixed version test networks if the prerequisites are available. Each test network reports PASS, FAIL, or SKIP. Closes ticket 16953. Patch by "teor". Also adds "--hs-multi-client 1" option to TEST_NETWORK_FLAGS. This resolves #17012. Larger networks, such as bridges+hs, may fail until #16952 is merged.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/include.am7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am
index ef2fd4fb8e..f7c0204832 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -8,6 +8,13 @@ endif
TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
src/test/test_workqueue src/test/test_keygen.sh $(TESTSCRIPTS)
+# These flavors are run using automake's test-driver and test-network.sh
+TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-min bridges+hs
+# only run if we can ping6 ::1 (localhost)
+TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min
+# only run if we can find a stable (or simply another) version of tor
+TEST_CHUTNEY_FLAVORS_MIXED = mixed
+
### This is a lovely feature, but it requires automake >= 1.12, and Tor
### doesn't require that yet. Below is a kludge to work around.
###