diff options
| author | teor <teor@torproject.org> | 2019-04-11 12:11:03 +1000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-12 08:38:30 -0400 |
| commit | 6d01879fe18d30fef10fc0fc6f746569082b3faf (patch) | |
| tree | 7b571f4a7a871e5dc91a380a6d29f6aa48b9471d /.travis.yml | |
| parent | 6ef38197985326ea7599db6e6abd5efb470ddd04 (diff) | |
| download | tor-6d01879fe18d30fef10fc0fc6f746569082b3faf.tar.gz tor-6d01879fe18d30fef10fc0fc6f746569082b3faf.zip | |
Travis: expand "make test-stem", so timelimit can signal python on timeout
Unlike kill, timelimit can only signal the process it launches. So we need
timelimit to launch python, not make.
Closes ticket 30117; diagnostic for 29437.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 144cfe0bd9..89040d8222 100644 --- a/.travis.yml +++ b/.travis.yml @@ -211,7 +211,7 @@ script: ## 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 timelimit -p -t 540 -s USR1 -T 30 -S ABRT make src/app/tor test-stem; fi + - 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 --log notice --target RUN_ALL; 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 |