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 | 7f629f7fd9e6e5fe04367e611eae48f8f2bad81a (patch) | |
| tree | 370676e085c7f01e502f5c4d7b81b153bc836580 | |
| parent | 667e66bb091829cb4b5af351af17f854f527d6d7 (diff) | |
| parent | 4c6a407b9d9436948dbbecffde32e28380240728 (diff) | |
| download | tor-7f629f7fd9e6e5fe04367e611eae48f8f2bad81a.tar.gz tor-7f629f7fd9e6e5fe04367e611eae48f8f2bad81a.zip | |
Merge branch 'maint-0.3.3'
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Makefile.am | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 6ea11ce9d8..aab6f6b3d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -160,7 +160,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 163b650bb0..97a39031a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -274,3 +274,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 |