[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5

[teor at torproject.org]

commit 316aed502e58102fa582ecd9902a3422c27b6dae
Merge: ea5e37182 3fa42d599
Author: teor <teor at torproject.org>
Date:   Sat Apr 6 09:32:53 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5

 .travis.yml      | 9 ++++++++-
 changes/bug30011 | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index f3ddd81ea,e70344ee2..45da26324
--- a/.travis.yml
+++ b/.travis.yml
@@@ -204,10 -208,9 +210,11 @@@ script
    - ./configure $CONFIGURE_FLAGS
    ## We run `make check` because that's what https://jenkins.torproject.org does.
    - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi
-   - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi
+   ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes
+   - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 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.