aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2020-03-16 20:54:27 +1000
committerteor <teor@torproject.org>2020-03-16 20:54:27 +1000
commit9ef8f5d1b8c646d1383327a3d45cddf27ab4b886 (patch)
treeaf3a16f9ae0d71be95b0e1ac72e710bd5c3f7407 /.travis.yml
parent2f4fa423c30c81092f06fb97c20f5d281b3cfac7 (diff)
parentc22696e3606f9873ddbf02b11dc91214853b8317 (diff)
downloadtor-9ef8f5d1b8c646d1383327a3d45cddf27ab4b886.tar.gz
tor-9ef8f5d1b8c646d1383327a3d45cddf27ab4b886.zip
Merge branch 'maint-0.4.1' into maint-0.4.2
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index c3903fe1e1..3a160840a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -244,7 +244,7 @@ after_failure:
## `make distcheck` puts it somewhere different.
- if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi
- if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi
- - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi
+ - if [[ "$CHUTNEY" != "" ]]; then "$CHUTNEY_PATH/tools/diagnostics.sh" || echo "diagnostics failed"; ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi
- if [[ "$TEST_STEM" != "" ]]; then tail -1000 "$STEM_SOURCE_DIR"/test/data/tor_log || echo "tail failed"; fi
- if [[ "$TEST_STEM" != "" ]]; then grep -v "SocketClosed" stem.log | tail -1000 || echo "grep | tail failed"; fi