Skip to content

Commit

Permalink
Travis: Terminate test-stem if it takes more than 15 minutes to run
Browse files Browse the repository at this point in the history
Diagnostic for 29437.

Fixes bug 30011; bugfix on 0.3.5.4-alpha.
  • Loading branch information
teor2345 committed Apr 4, 2019
1 parent 0418d40 commit b4bec5b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
9 changes: 8 additions & 1 deletion .travis.yml
Expand Up @@ -131,6 +131,9 @@ addons:
- docbook-xsl
- docbook-xml
- xmlto
## Utilities
## preventing or diagnosing hangs
- timelimit
## (OSX only)
homebrew:
packages:
Expand All @@ -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
Expand Down Expand Up @@ -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 900 make src/app/tor test-stem; fi
- if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi

after_failure:
Expand Down
3 changes: 3 additions & 0 deletions changes/bug30011
@@ -0,0 +1,3 @@
o Minor bugfixes (CI):
- Terminate test-stem if it takes more than 15 minutes to run.
Diagnostic for 29437. Fixes bug 30011; bugfix on 0.3.5.4-alpha.

0 comments on commit b4bec5b

Please sign in to comment.