commit f0230ee38a5031d447758259245a5121ec7e4789
parent c5899d5cf3a761f4049c1d6f05232731edcfeb57
Author: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Apr 2018 10:48:18 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
Diffstat:
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
@@ -97,6 +97,8 @@ matrix:
- compiler: gcc
- compiler: gcc
env: RUST_OPTIONS=""
+ - compiler: gcc
+ env: COVERAGE_OPTIONS="--enable-coverage"
## The "sudo: required" forces non-containerized builds, working
## around a Travis CI environment issue: clang LeakAnalyzer fails
## because it requires ptrace and the containerized environment no
@@ -112,6 +114,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
## Download rustup
- 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:
## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)
@@ -133,10 +136,14 @@ install:
script:
- ./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.
- make check
after_failure:
## `make check` will leave a log file with more details of test failures.
- 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
diff --git a/changes/coveralls b/changes/coveralls
@@ -0,0 +1,3 @@
+ o Minor features (continuous integration):
+ - Our Travis CI configuration now integrates with the Coveralls coverage
+ analysis tool. Closes ticket 25818.
