commit fb32c522320430f0fb419e1f05530850a5a90d2f Author: teor teor2345@gmail.com Date: Tue Feb 28 01:46:16 2017 +1100

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

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

Implements 21570. --- Makefile.am | 5 +++++ changes/feature21570 | 5 +++++ 2 files changed, 10 insertions(+)

diff --git a/Makefile.am b/Makefile.am index 631b44e..880420b 100644 --- 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 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.