nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Implements 21570.
This commit is contained in:
teor 2017-02-28 01:46:16 +11:00
parent 39a4c5624b
commit fb32c52232
No known key found for this signature in database
GPG Key ID: 450CBA7F968F094B
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -54,6 +54,7 @@ TEST_CFLAGS=
TEST_CPPFLAGS=-DTOR_UNIT_TESTS TEST_CPPFLAGS=-DTOR_UNIT_TESTS
TEST_NETWORK_FLAGS=--hs-multi-client 1 TEST_NETWORK_FLAGS=--hs-multi-client 1
endif endif
TEST_NETWORK_WARNING_FLAGS=--quiet --only-warnings
if LIBFUZZER_ENABLED if LIBFUZZER_ENABLED
TEST_CFLAGS += -fsanitize-coverage=trace-pc-guard,trace-cmp,trace-div 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; \ done; \
for f in $$flavors; do \ 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); \ $(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; \ done; \
echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ 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_log/*.trs

5
changes/feature21570 Normal file
View File

@ -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.