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 | 67bdd144bd0bc3d6f063ae8b21c67e3f1cb1fbca (patch) | |
| tree | 3a53173cd9a50004ebde7333adf7b5d72f0ba3bb | |
| parent | a28c14aad547fd1b254bdbf2acc1ff2b67551a96 (diff) | |
| parent | 2b1b8bf2cad4af304d38f88e38047dadddd7e0be (diff) | |
| download | tor-67bdd144bd0bc3d6f063ae8b21c67e3f1cb1fbca.tar.gz tor-67bdd144bd0bc3d6f063ae8b21c67e3f1cb1fbca.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | changes/bug27453 | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 09bd04505c..4969dc005b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -178,11 +178,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. diff --git a/changes/bug27453 b/changes/bug27453 new file mode 100644 index 0000000000..4501346d2c --- /dev/null +++ b/changes/bug27453 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - When a Travis build fails, and showing a log fails, keep trying to + show the other logs. Fixes bug 27453; bugfix on 0.3.4.7-rc. |