diff options
| author | teor <teor@torproject.org> | 2019-06-14 12:13:28 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-06-14 12:13:28 +1000 |
| commit | 1cad1f98045260c384c27afb7375ada2b00b4cb9 (patch) | |
| tree | df712483e996123e690a65ac6dfb8671beb5edfc /.travis.yml | |
| parent | cdda69ca8ac611802ef2dcf6e5cf60977ab49209 (diff) | |
| download | tor-1cad1f98045260c384c27afb7375ada2b00b4cb9.tar.gz tor-1cad1f98045260c384c27afb7375ada2b00b4cb9.zip | |
Travis: Don't log stem's SocketClosed TRACE logs to the console
And fix some nearby comments.
Part of 30591.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 01f155af26..d5ef6dba2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -210,8 +210,9 @@ 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 - ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes - - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE; fi + ## Diagnostic for bug 29437: kill stem if it hangs for 9.5 minutes + ## Travis will kill the job after 10 minutes with no output + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE | grep -v SocketClosed; 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 |