summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-03 13:38:54 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-03 13:38:54 -0400
commitbe5b4415c2dce243a6249e6ca14b65423c9b0746 (patch)
tree60c60f213aac9743117795607923b25550392973 /.travis.yml
parent246765342e681ae6f8c35709f9acd9a78d7048d2 (diff)
parent6361a250f08421aa1e6db1093aaa488ee24ce77d (diff)
downloadtor-be5b4415c2dce243a6249e6ca14b65423c9b0746.tar.gz
tor-be5b4415c2dce243a6249e6ca14b65423c9b0746.zip
Merge branch 'maint-0.3.1' into maint-0.3.2
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 3f133782d1..8dcbf1fe9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -145,7 +145,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.