nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.1' into maint-0.3.2

Browse Source
This commit is contained in:
Nick Mathewson 2018-04-24 10:38:37 -04:00
commit 89a3fafd49
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -99,6 +99,8 @@ 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"
## 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
@ -138,7 +140,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.

4
changes/travis_distcheck Normal file
View File

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