commit 6d01879fe18d30fef10fc0fc6f746569082b3faf Author: teor teor@torproject.org Date: Thu Apr 11 12:11:03 2019 +1000

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. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml index 144cfe0bd..89040d822 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