diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-09 18:14:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-09 18:14:27 -0400 |
| commit | 61c0bae4f20556cf155562582ea00a6a147252d6 (patch) | |
| tree | 136930c61dc59c63054a9a5db4e13e95452703b3 | |
| parent | 7fe80c29056d7e98b9443e151343c886cf8c7dd3 (diff) | |
| parent | 85c698da72ef3737e7c209732b2a9b892c9273fa (diff) | |
| download | tor-61c0bae4f20556cf155562582ea00a6a147252d6.tar.gz tor-61c0bae4f20556cf155562582ea00a6a147252d6.zip | |
Merge branch 'bug19008_027' into maint-0.2.7
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | changes/bug19008 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index beea69d95e..6fd94058e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,7 @@ test-network: need-chutney-path all test-network-all: need-chutney-path all test-driver mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) @flavors="$(TEST_CHUTNEY_FLAVORS)"; \ - if ping6 -q -o ::1 >/dev/null 2>&1; then \ + if ping6 -q -c 1 -o ::1 >/dev/null 2>&1; then \ echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \ else \ diff --git a/changes/bug19008 b/changes/bug19008 new file mode 100644 index 0000000000..c51c98faa6 --- /dev/null +++ b/changes/bug19008 @@ -0,0 +1,3 @@ + o Major bugfixes (testing): + - Fix a bug that would block 'make test-network-all' on systems + where IPv6 packets were lost. Fixes bug 19008; bugfix on tor-0.2.7.3-rc. |