aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorTaylor Yu <catalyst@torproject.org>2018-04-26 16:07:56 -0500
committerTaylor Yu <catalyst@torproject.org>2018-04-26 16:07:56 -0500
commitf0dc6c8e2a68764b73ea4b3fdb50f74b070c183b (patch)
treefdfd1e9def399482babbd2f802ae9761af9da2ac /.travis.yml
parent58f54a3588cf722a31b10fa0450225f7685c8629 (diff)
parent2edc9cd48457169409841c794832172bc959e63a (diff)
downloadtor-f0dc6c8e2a68764b73ea4b3fdb50f74b070c183b.tar.gz
tor-f0dc6c8e2a68764b73ea4b3fdb50f74b070c183b.zip
Merge branch 'bug25936-032' into bug25936-033
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 18c5b5bdd5..9672656a32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -157,7 +157,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.