Merge branch 'maint-0.3.3'
This commit is contained in:
commit
7f629f7fd9
|
@ -160,7 +160,9 @@ script:
|
||||||
|
|
||||||
after_failure:
|
after_failure:
|
||||||
## `make check` will leave a log file with more details of test failures.
|
## `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:
|
after_success:
|
||||||
## If this build was one that produced coverage, upload it.
|
## If this build was one that produced coverage, upload it.
|
||||||
|
|
|
@ -274,3 +274,11 @@ if USE_RUST
|
||||||
distclean-local: distclean-rust
|
distclean-local: distclean-rust
|
||||||
endif
|
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
|
||||||
|
|
Loading…
Reference in New Issue