diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-09-05 09:56:19 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-09-05 09:56:19 -0400 |
commit | 4ab033c3bc94950ffe442c5f7b5a87f3f3382996 (patch) | |
tree | 549481f68d0c6bb313c95302dfca20b887a46d7e /.travis.yml | |
parent | 0ea622aa3a678f19759a42e9521a259ef4bcf5a4 (diff) | |
parent | 67bdd144bd0bc3d6f063ae8b21c67e3f1cb1fbca (diff) | |
download | tor-4ab033c3bc94950ffe442c5f7b5a87f3f3382996.tar.gz tor-4ab033c3bc94950ffe442c5f7b5a87f3f3382996.zip |
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 7db7577856..6c088fd95c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -181,11 +181,11 @@ script: after_failure: ## configure will leave a log file with more details of config failures. ## But the log is too long for travis' rendered view, so tail it. - - tail -1000 config.log + - tail -1000 config.log || echo "tail failed" ## `make check` will leave a log file with more details of test failures. - - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log; fi + - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog; fi + - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi after_success: ## If this build was one that produced coverage, upload it. |