summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-03 13:38:51 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-03 13:38:51 -0400
commit44626b37f6c6bcc1907cd269b8e9bc77909f9d51 (patch)
tree6b83447ca58832580602767499f48ed540cd6f9e /.travis.yml
parent1bbe75da6db551e2c5afe32efe68eb8ea7b60048 (diff)
parentf0dc6c8e2a68764b73ea4b3fdb50f74b070c183b (diff)
downloadtor-44626b37f6c6bcc1907cd269b8e9bc77909f9d51.tar.gz
tor-44626b37f6c6bcc1907cd269b8e9bc77909f9d51.zip
Merge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 46317ee064..738284569d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -155,7 +155,9 @@ script:
after_failure:
## `make check` will leave a log file with more details of test failures.
- - cat test-suite.log
+ - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log; fi
+ ## `make distcheck` puts it somewhere different.
+ - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog; fi
after_success:
## If this build was one that produced coverage, upload it.