Merge branch 'bug25936-031' into bug25936-032

This commit is contained in:
Taylor Yu 2018-04-26 15:58:39 -05:00
commit 2edc9cd484
2 changed files with 12 additions and 1 deletions

View File

@ -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.

View File

@ -247,3 +247,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