Log tor warnings during 'make test-network-all'

Requires the chutney changes from 21572.
(Otherwise, asks users to upgrade their chutney.)

Implements 21570.

diff --git a/Makefile.am b/Makefile.am
index 631b44e7f5d46223a5f2c60e4a63206108c2835b..880420b287e8d1900de4c720d24200d5ef97be4c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,6 +54,7 @@ TEST_CFLAGS=
 TEST_CPPFLAGS=-DTOR_UNIT_TESTS
 TEST_NETWORK_FLAGS=--hs-multi-client 1
 endif
+TEST_NETWORK_WARNING_FLAGS=--quiet --only-warnings
 
 if LIBFUZZER_ENABLED
 TEST_CFLAGS += -fsanitize-coverage=trace-pc-guard,trace-cmp,trace-div
@@ -135,6 +136,10 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/
        done; \
        for f in $$flavors; do \
                $(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) $(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
+               $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_WARNING_FLAGS); \
+               if test $$? -eq 2 ; then \
+                       echo "Please update your chutney using 'git pull' to see tor warnings here."; \
+               fi; \
        done; \
        echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \
        ! grep -q FAIL test_network_log/*.trs

diff --git a/changes/feature21570 b/changes/feature21570
new file mode 100644 (file)
index 0000000..40555ee
--- /dev/null
+++ b/changes/feature21570
@@ -0,0 +1,5 @@
+  o Minor features (testing):
+    - During 'make test-network-all', if tor logs any warnings, ask chutney
+      to output them. Requires a recent version of chutney with the 21572
+      patch.
+      Implements 21570.