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-17 10:48:18 -04:00
commit f0230ee38a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -97,6 +97,8 @@ matrix:
- compiler: gcc - compiler: gcc
- compiler: gcc - compiler: gcc
env: RUST_OPTIONS="" env: RUST_OPTIONS=""
- compiler: gcc
env: COVERAGE_OPTIONS="--enable-coverage"
## 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
@ -112,6 +114,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
## Download rustup ## Download rustup
- if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi
- if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi
install: install:
## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)
@ -133,10 +136,14 @@ install:
script: script:
- ./autogen.sh - ./autogen.sh
- ./configure $RUST_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 - make check
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 - cat test-suite.log
after_success:
## If this build was one that produced coverage, upload it.
- if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi

3
changes/coveralls Normal file
View File

@ -0,0 +1,3 @@
o Minor features (continuous integration):
- Our Travis CI configuration now integrates with the Coveralls coverage
analysis tool. Closes ticket 25818.