diff options
| author | George Kadianakis <desnacked@riseup.net> | 2019-04-05 14:57:06 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2019-04-05 14:57:06 +0300 |
| commit | 5584b6392d2e1f5bbaf9420e3cf5dfa6185d9d6c (patch) | |
| tree | e0f1f8ccb659ce44f45696070e94468f0312731b | |
| parent | 76f1763976948faab07a98048958e86a28a8ef29 (diff) | |
| parent | 2cc3c98bc4fbdbb1cd11bae2d98f3f26164d1799 (diff) | |
| download | tor-5584b6392d2e1f5bbaf9420e3cf5dfa6185d9d6c.tar.gz tor-5584b6392d2e1f5bbaf9420e3cf5dfa6185d9d6c.zip | |
Merge branch 'maint-0.4.0'
| -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 d7db65bed3..bda1f323e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -127,13 +127,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: @@ -153,11 +156,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 @@ -209,7 +215,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 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. |