diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-17 10:47:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-17 10:48:08 -0400 |
| commit | ce8e7427b9284ef12b69d50d72c8fc315b90e36d (patch) | |
| tree | 8aff663551ec6b695327029104522e83d5810a46 | |
| parent | 5e0fbd7006993a4e402f2eee49f6f86074923197 (diff) | |
| parent | d3ff1263092d9ca205b5b54b77db31633bcd80b4 (diff) | |
| download | tor-ce8e7427b9284ef12b69d50d72c8fc315b90e36d.tar.gz tor-ce8e7427b9284ef12b69d50d72c8fc315b90e36d.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.1
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | changes/coveralls | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 0c01884106..bf55b7756a 100644 --- 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 new file mode 100644 index 0000000000..7fa69bb2b4 --- /dev/null +++ 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. |