diff options
| author | Taylor Yu <catalyst@torproject.org> | 2018-04-26 16:07:56 -0500 |
|---|---|---|
| committer | Taylor Yu <catalyst@torproject.org> | 2018-04-26 16:07:56 -0500 |
| commit | f0dc6c8e2a68764b73ea4b3fdb50f74b070c183b (patch) | |
| tree | fdfd1e9def399482babbd2f802ae9761af9da2ac | |
| parent | 58f54a3588cf722a31b10fa0450225f7685c8629 (diff) | |
| parent | 2edc9cd48457169409841c794832172bc959e63a (diff) | |
| download | tor-f0dc6c8e2a68764b73ea4b3fdb50f74b070c183b.tar.gz tor-f0dc6c8e2a68764b73ea4b3fdb50f74b070c183b.zip | |
Merge branch 'bug25936-032' into bug25936-033
| -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 18c5b5bdd5..9672656a32 100644 --- a/.travis.yml +++ b/.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. diff --git a/Makefile.am b/Makefile.am index 04ca88a236..08cb8e3e7e 100644 --- a/Makefile.am +++ b/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 |