diff options
| author | teor <teor@torproject.org> | 2019-04-06 09:32:53 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-06 09:32:53 +1000 |
| commit | 316aed502e58102fa582ecd9902a3422c27b6dae (patch) | |
| tree | 4334d8bda67f9348b01ae746f10edca74dec0afe /.travis.yml | |
| parent | ea5e371822d58eb25eda912ba8afb8c0951b424c (diff) | |
| parent | 3fa42d599a205e51c91efb953af70a45e877eafe (diff) | |
| download | tor-316aed502e58102fa582ecd9902a3422c27b6dae.tar.gz tor-316aed502e58102fa582ecd9902a3422c27b6dae.zip | |
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index f3ddd81ea1..45da263246 100644 --- a/.travis.yml +++ b/.travis.yml @@ -133,6 +133,9 @@ addons: - docbook-xsl - docbook-xml - xmlto + ## Utilities + ## preventing or diagnosing hangs + - timelimit ## (OSX only) homebrew: packages: @@ -156,6 +159,9 @@ addons: ## Always installed, because manual brew installs are hard to get right - asciidoc - xmlto + ## Utilities + ## preventing or diagnosing hangs + - timelimit ## (OSX only) Use the default OSX image ## See https://docs.travis-ci.com/user/reference/osx#os-x-version @@ -204,7 +210,8 @@ 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 |