commit 2cc3c98bc4fbdbb1cd11bae2d98f3f26164d1799 Merge: 7fe169a50 ef06ef217 Author: George Kadianakis desnacked@riseup.net Date: Fri Apr 5 14:56:52 2019 +0300

Merge branch 'tor-github/pr/901' into maint-0.4.0

.travis.yml | 13 ++++++++++--- changes/bug30011 | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-)

diff --cc .travis.yml index d7db65bed,498069d82..bda1f323e --- a/.travis.yml +++ b/.travis.yml @@@ -209,10 -213,9 +215,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.