tor

commit 2f618094d25db35436a1e6962f4f8393d6470a08
parent 824160fd827ddacb3b030952c516e10a03671d4b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  5 Sep 2018 09:56:19 -0400

Merge branch 'maint-0.3.4'

Diffstat:
M
.travis.yml
 | 
6
+++---
A
changes/bug27453
 | 
3
+++

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git 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.
diff --git a/changes/bug27453 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.