diff options
| author | teor <teor@torproject.org> | 2019-04-04 13:23:26 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-04 13:23:26 +1000 |
| commit | ef06ef217a828e3c34358bc53da41932bc129017 (patch) | |
| tree | eed14618dba357ce2998077fe04dc42d8bc55272 | |
| parent | 9242f32883e2eff53ddc8217255168e91c6e3e7f (diff) | |
| parent | 3fa42d599a205e51c91efb953af70a45e877eafe (diff) | |
| download | tor-ef06ef217a828e3c34358bc53da41932bc129017.tar.gz tor-ef06ef217a828e3c34358bc53da41932bc129017.zip | |
Merge branch 'bug30011_035' into bug30011_040
Merge bug30011 new package timelimit with 0.4.0 new package shellcheck.
Move shellcheck into the correct category.
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | changes/bug30011 | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 474f6867fd..498069d827 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,13 +125,16 @@ addons: - libseccomp-dev ## zstd doesn't exist in Ubuntu Trusty #- libzstd + - shellcheck ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc - docbook-xsl - docbook-xml - xmlto - - shellcheck + ## Utilities + ## preventing or diagnosing hangs + - timelimit ## (OSX only) homebrew: packages: @@ -151,11 +154,14 @@ addons: - pkg-config ## Optional build dependencies - ccache + - shellcheck ## Conditional build dependencies ## Always installed, because manual brew installs are hard to get right - asciidoc - xmlto - - shellcheck + ## 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 @@ -207,7 +213,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: diff --git a/changes/bug30011 b/changes/bug30011 new file mode 100644 index 0000000000..4c9069e291 --- /dev/null +++ b/changes/bug30011 @@ -0,0 +1,4 @@ + o Minor bugfixes (CI): + - 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. |