nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: Add an IPv6 mixed chutney network

Browse Source 
This network is used in make test-network-all and test-network-ipv6.

Closes 33334.
This commit is contained in:
teor 2020-02-17 14:50:24 +10:00
parent 85eb170923
commit da280a4309
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -317,7 +317,8 @@ test-network-all:
@$(MAKE) test-network-run \ @$(MAKE) test-network-run \
ipv4_flavors="$(TEST_CHUTNEY_FLAVORS)" \ ipv4_flavors="$(TEST_CHUTNEY_FLAVORS)" \
mixed_flavors="$(TEST_CHUTNEY_FLAVORS_MIXED)" \ mixed_flavors="$(TEST_CHUTNEY_FLAVORS_MIXED)" \
ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" \
ipv6_mixed_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6_MIXED)"
@$(MAKE) test-network-results @$(MAKE) test-network-results
# Run IPv4 and mixed tests using automake's test-driver # Run IPv4 and mixed tests using automake's test-driver
@ -338,7 +339,8 @@ test-network-ipv6:
@$(MAKE) test-network-mkdir @$(MAKE) test-network-mkdir
@$(MAKE) test-network-clean @$(MAKE) test-network-clean
@$(MAKE) test-network-run \ @$(MAKE) test-network-run \
ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" \
ipv6_mixed_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6_MIXED)"
@$(MAKE) test-network-results @$(MAKE) test-network-results
# Make the test network log directory, if it does not exist # Make the test network log directory, if it does not exist

5
changes/ticket33334 Normal file
View File

@ -0,0 +1,5 @@
o Testing:
- Test v3 onion services to tor's mixed IPv4 chutney network. And add a
mixed IPv6 chutney network. These networks are used in the
test-network-all, test-network-ipv4, and test-network-ipv6 make targets.
Closes ticket 33334.

3
src/test/include.am
View File

@ -79,6 +79,9 @@ TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
# only run if we can find a stable (or simply another) version of tor # only run if we can find a stable (or simply another) version of tor
TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23 TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23
# only run if IPv6 and mixed networks are run
TEST_CHUTNEY_FLAVORS_IPV6_MIXED = mixed+hs-v23-ipv6
### This is a lovely feature, but it requires automake >= 1.12, and Tor ### This is a lovely feature, but it requires automake >= 1.12, and Tor
### doesn't require that yet. ### doesn't require that yet.
### ###