diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-03 13:38:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-03 13:38:54 -0400 |
| commit | add0306cab6d16225eb1ae195064994cd3d1d481 (patch) | |
| tree | 4100b5072d0cdc2b7ddc47cc16a7b13706cef588 | |
| parent | 7d509bc17027172ff3000fbd56216c672fe5ac08 (diff) | |
| parent | 5227754b2f441c93da6436697a19841e9e71246f (diff) | |
| download | tor-add0306cab6d16225eb1ae195064994cd3d1d481.tar.gz tor-add0306cab6d16225eb1ae195064994cd3d1d481.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -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 6da3027b85..6a3e1bfc01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,7 +125,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 f400728bac..f06d0e3734 100644 --- a/Makefile.am +++ b/Makefile.am @@ -216,3 +216,12 @@ mostlyclean-local: rm -rf $(HTML_COVER_DIR) rm -rf $(top_builddir)/doc/doxygen rm -rf $(TEST_NETWORK_ALL_LOG_DIR) + +# 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 |