Commit 43092e21 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'teor/feature20069'

parents 128f7ffb 26b47f80

changes/feature20069

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  o Minor feature (testing, ipv6):

    - Add the hs-ipv6 chutney target to make test-network-all's IPv6

      tests. Remove bridges+hs, as it's somewhat redundant.

      This requires a recent chutney version that supports IPv6 clients,

      relays, and authorities.

      Closes ticket 20069; patch by teor.

src/test/include.am

+2 −2
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 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 bridges+hs

TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-min

# only run if we can ping6 ::1 (localhost)

TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min

TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-ipv6

# only run if we can find a stable (or simply another) version of tor

TEST_CHUTNEY_FLAVORS_MIXED = mixed