nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.2' into release-0.3.2

Browse Source
This commit is contained in:
Nick Mathewson 2018-09-05 09:56:19 -04:00
commit b79a448357
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -179,11 +179,11 @@ script:
after_failure: after_failure:
## configure will leave a log file with more details of config failures. ## 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. ## 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. ## `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. ## `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: after_success:
## If this build was one that produced coverage, upload it. ## If this build was one that produced coverage, upload it.

3
changes/bug27453 Normal file
View File

@ -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.