diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-06 19:06:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-06 19:06:32 -0400 |
| commit | 43092e21c1874086076aa910fc2cba843bcaed39 (patch) | |
| tree | 83a365437f004ab35031f896e49b10321d1bcabd /src/test | |
| parent | 128f7ffbc0cda7760b96b4d8eeda9550e2626f04 (diff) | |
| parent | 26b47f80dd87b3684d43bd6d1b4b9f4d773eed75 (diff) | |
| download | tor-43092e21c1874086076aa910fc2cba843bcaed39.tar.gz tor-43092e21c1874086076aa910fc2cba843bcaed39.zip | |
Merge remote-tracking branch 'teor/feature20069'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/include.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/include.am b/src/test/include.am index 2e91f7c9dc..0aff395091 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -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 |