aboutsummaryrefslogtreecommitdiff
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
commit7f629f7fd9e6e5fe04367e611eae48f8f2bad81a (patch)
tree370676e085c7f01e502f5c4d7b81b153bc836580 /.travis.yml
parent667e66bb091829cb4b5af351af17f854f527d6d7 (diff)
parent4c6a407b9d9436948dbbecffde32e28380240728 (diff)
downloadtor-7f629f7fd9e6e5fe04367e611eae48f8f2bad81a.tar.gz
tor-7f629f7fd9e6e5fe04367e611eae48f8f2bad81a.zip
Merge branch '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 6ea11ce9d8..aab6f6b3d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -160,7 +160,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.