diff options
| author | teor <teor@torproject.org> | 2019-04-04 13:02:13 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-04 13:21:35 +1000 |
| commit | 3fa42d599a205e51c91efb953af70a45e877eafe (patch) | |
| tree | 3a1c67b30c2affff4ac03b40b7d5812da8156370 /.travis.yml | |
| parent | 0418d4081acd2708a16dd757af4aac4777658da9 (diff) | |
| download | tor-3fa42d599a205e51c91efb953af70a45e877eafe.tar.gz tor-3fa42d599a205e51c91efb953af70a45e877eafe.zip | |
Travis: Terminate test-stem if it takes more than 9.5 minutes to run
(Travis terminates the job after 10 minutes of no output.)
Diagnostic for 29437.
Fixes bug 30011; bugfix on 0.3.5.4-alpha.
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 b5713d6933..e70344ee2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,6 +131,9 @@ addons: - docbook-xsl - docbook-xml - xmlto + ## Utilities + ## preventing or diagnosing hangs + - timelimit ## (OSX only) homebrew: packages: @@ -154,6 +157,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 @@ -202,7 +208,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 after_failure: |