aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorTaylor Yu <catalyst@torproject.org>2018-04-26 15:46:57 -0500
committerTaylor Yu <catalyst@torproject.org>2018-04-26 15:46:57 -0500
commit59821050982a7e1c6906de61b6742546378e569c (patch)
tree6bc882bcd9530550eca4567c86878cbc2490956e /.travis.yml
parentbb35405d2ad01dbc8cf59ed275c41bd7d6098ae8 (diff)
parent31865b50295753706ff3a9eb598e080bb2167639 (diff)
downloadtor-59821050982a7e1c6906de61b6742546378e569c.tar.gz
tor-59821050982a7e1c6906de61b6742546378e569c.zip
Merge branch 'bug25936-029' into bug25936-031
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.