Browse Source

Merge branch 'bug25936-032' into bug25936-033

Taylor Yu 6 years ago
parent
commit
f0dc6c8e2a
2 changed files with 11 additions and 1 deletions
  1. 3 1
      .travis.yml
  2. 8 0
      Makefile.am

+ 3 - 1
.travis.yml

@@ -157,7 +157,9 @@ script:
 
 after_failure:
   ## `make check` will leave a log file with more details of test failures.
-  - cat test-suite.log
+  - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log; fi
+  ## `make distcheck` puts it somewhere different.
+  - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog; fi
 
 after_success:
   ## If this build was one that produced coverage, upload it.

+ 8 - 0
Makefile.am

@@ -254,3 +254,11 @@ if USE_RUST
 distclean-local: distclean-rust
 endif
 
+# This relies on some internal details of how automake implements
+# distcheck.  We check two directories because automake-1.15 changed
+# from $(distdir)/_build to $(distdir)/_build/sub.
+show-distdir-testlog:
+	@if test -d "$(distdir)/_build/sub"; then \
+	  cat $(distdir)/_build/sub/$(TEST_SUITE_LOG); \
+	else \
+	  cat $(distdir)/_build/$(TEST_SUITE_LOG); fi