diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-03 13:38:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-03 13:38:46 -0400 |
| commit | 726f238b723dfaa88df763bec7e923e99430ea87 (patch) | |
| tree | 396ea6b33f03c98895aa825726b9bcf1bca92cb4 | |
| parent | 993e314c6f08d587480070e9f19d313b81b39a09 (diff) | |
| parent | 59821050982a7e1c6906de61b6742546378e569c (diff) | |
| download | tor-726f238b723dfaa88df763bec7e923e99430ea87.tar.gz tor-726f238b723dfaa88df763bec7e923e99430ea87.zip | |
Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Makefile.am | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 3f133782d1..8dcbf1fe9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -145,7 +145,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. diff --git a/Makefile.am b/Makefile.am index 79d2e78521..1a6d8e7d12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -240,3 +240,12 @@ mostlyclean-local: clean-local: rm -rf $(top_builddir)/src/rust/target rm -rf $(top_builddir)/src/rust/.cargo/registry + +# 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 |