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 | 39792f430a90849202039f8fc8fa0bc9dc7a18b6 (patch) | |
| tree | 884d96e763a4108d9b8fc3c5e45b82b49cfe6fc8 | |
| parent | 6b3b59ad7cc4596f57fa73e1a0355f6e937bd516 (diff) | |
| parent | 67bdd144bd0bc3d6f063ae8b21c67e3f1cb1fbca (diff) | |
| download | tor-39792f430a90849202039f8fc8fa0bc9dc7a18b6.tar.gz tor-39792f430a90849202039f8fc8fa0bc9dc7a18b6.zip | |
Merge branch 'maint-0.3.3' into release-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. |