diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-09 18:14:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-09 18:14:44 -0400 |
| commit | 5cd59791328c1a0e6987d83b9b55aeccbbf6eaf4 (patch) | |
| tree | dc22f75aa5d6d81495f0c3c4cb82e5fcd8772155 /Makefile.am | |
| parent | 55cf1970bce222a32c387652fe5080adb2aa1513 (diff) | |
| parent | 61c0bae4f20556cf155562582ea00a6a147252d6 (diff) | |
| download | tor-5cd59791328c1a0e6987d83b9b55aeccbbf6eaf4.tar.gz tor-5cd59791328c1a0e6987d83b9b55aeccbbf6eaf4.zip | |
Merge branch 'maint-0.2.7' into maint-0.2.8
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 92ba2b868d..cd88264264 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,7 +104,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 \ |