summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorTaylor Yu <catalyst@torproject.org>2018-04-26 15:58:39 -0500
committerTaylor Yu <catalyst@torproject.org>2018-04-26 15:58:39 -0500
commit2edc9cd48457169409841c794832172bc959e63a (patch)
tree1f6ae71dbf3b45996254ba8e767dc968bd908a40 /.travis.yml
parent7c3f87eb4b2c3c4ce3422b3561bee36f3c9956c1 (diff)
parent59821050982a7e1c6906de61b6742546378e569c (diff)
downloadtor-2edc9cd48457169409841c794832172bc959e63a.tar.gz
tor-2edc9cd48457169409841c794832172bc959e63a.zip
Merge branch 'bug25936-031' into bug25936-032
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.