Merge branch 'maint-0.3.3' into release-0.3.3
This commit is contained in:
commit
148540c505
|
@ -102,6 +102,10 @@ matrix:
|
||||||
env: RUST_OPTIONS=""
|
env: RUST_OPTIONS=""
|
||||||
- compiler: gcc
|
- compiler: gcc
|
||||||
env: COVERAGE_OPTIONS="--enable-coverage"
|
env: COVERAGE_OPTIONS="--enable-coverage"
|
||||||
|
- compiler: gcc
|
||||||
|
env: DISTCHECK="yes" RUST_OPTIONS=""
|
||||||
|
- compiler: gcc
|
||||||
|
env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
|
||||||
## The "sudo: required" forces non-containerized builds, working
|
## The "sudo: required" forces non-containerized builds, working
|
||||||
## around a Travis CI environment issue: clang LeakAnalyzer fails
|
## around a Travis CI environment issue: clang LeakAnalyzer fails
|
||||||
## because it requires ptrace and the containerized environment no
|
## because it requires ptrace and the containerized environment no
|
||||||
|
@ -148,7 +152,8 @@ script:
|
||||||
- ./autogen.sh
|
- ./autogen.sh
|
||||||
- ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening
|
- ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening
|
||||||
## We run `make check` because that's what https://jenkins.torproject.org does.
|
## We run `make check` because that's what https://jenkins.torproject.org does.
|
||||||
- make check
|
- if [[ "$DISTCHECK" == "" ]]; then make check; fi
|
||||||
|
- if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening"; fi
|
||||||
|
|
||||||
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.
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor features (continuous integration):
|
||||||
|
- Our .travis.yml configuration now includes support for testing
|
||||||
|
the results of "make distcheck". (It's not uncommon for "make check" to
|
||||||
|
pass but "make distcheck" to fail.) Closes ticket 25814.
|
Loading…
Reference in New Issue