diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-17 10:48:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-17 10:48:18 -0400 |
| commit | 44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b (patch) | |
| tree | effe605191346689ebf9439162005dfd69821d31 /.travis.yml | |
| parent | 93ff1870ba153332ab695e53d906da6a14a8097c (diff) | |
| parent | f0230ee38a5031d447758259245a5121ec7e4789 (diff) | |
| download | tor-44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b.tar.gz tor-44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 27534e4cfe..3d61f5a61a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,6 +100,8 @@ matrix: env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - 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 @@ -118,6 +120,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) @@ -143,10 +146,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 |