[tor-commits] [tor/maint-0.4.0] Merge branch 'bug29036-29962-034' into bug29036-29962-035

[asn at torproject.org]

commit 7014e57f4a05d2be5486aedd754272c70d365354
Merge: 3280e9a11 33be8d829
Author: teor <teor at torproject.org>
Date:   Mon Apr 1 14:11:20 2019 +1000

    Merge branch 'bug29036-29962-034' into bug29036-29962-035
    
    Merge the moved coverage line from 29036 with the stem changes in
    maint-0.3.5.

 .travis.yml         | 15 +++++++++++----
 Makefile.am         |  4 +++-
 changes/bug29036    |  5 +++++
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --cc .travis.yml
index b5713d693,ed805aac3..f3ddd81ea
--- a/.travis.yml
+++ b/.travis.yml
@@@ -201,9 -201,10 +203,11 @@@ script
    - echo "Configure flags are $CONFIGURE_FLAGS"
    - ./configure $CONFIGURE_FLAGS
    ## We run `make check` because that's what https://jenkins.torproject.org does.
 -  - if [[ "$DISTCHECK" == "" ]]; then make check; fi
 -  - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
 +  - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi
 +  - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi
 +  - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
+   ## 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' || echo "Coverage failed"; fi
  
  after_failure:
    ## configure will leave a log file with more details of config failures.
@@@ -213,11 -214,13 +217,14 @@@
    - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi
    ## `make distcheck` puts it somewhere different.
    - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi
 +  - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi
  
- 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
+ before_cache:
+   ## Delete all gcov files.
+   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
+   ## Delete the cargo registry before caching .cargo, because it's cheaper to
+   ## download the registry and throw it away, rather than caching it
+   - rm -rf $HOME/.cargo/registry
  
  notifications:
    irc: