|
@@ -123,6 +123,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert
|
|
|
# Try both the BSD and the Linux ping6 syntax, because they're incompatible
|
|
|
test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert
|
|
|
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
|
|
|
+ rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
|
|
|
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
|
|
|
if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1; then \
|
|
|
echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \
|
|
@@ -146,7 +147,7 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/
|
|
|
$(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_WARNING_FLAGS); \
|
|
|
done; \
|
|
|
echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \
|
|
|
- ! grep -q FAIL test_network_log/*.trs
|
|
|
+ ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
|
|
|
|
|
|
need-stem-path:
|
|
|
@if test ! -d "$$STEM_SOURCE_DIR"; then \
|