[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm@xxxxxxxxxxxxxx]

commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d
Merge: 5e0fbd700 d3ff12630
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Apr 17 10:47:30 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 .travis.yml       | 9 ++++++++-
 changes/coveralls | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index 0c0188410,dc0a8ac67..bf55b7756
--- a/.travis.yml
+++ b/.travis.yml
@@@ -96,7 -89,7 +96,9 @@@ matrix
    include:
      - 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
@@@ -111,7 -101,8 +113,8 @@@ before_install
    ## If we're on OSX, homebrew usually needs to updated first
    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
    ## Download rustup
 -  - curl -Ssf -o rustup.sh https://sh.rustup.rs
 +  - 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)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits