From 6ef38197985326ea7599db6e6abd5efb470ddd04 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 10 Apr 2019 21:15:04 +1000 Subject: Travis: use stem backtrace signals with timelimit Part of 30117. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 45da263246..144cfe0bd9 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 -T 30 make src/app/tor test-stem; fi + - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -s USR1 -T 30 -S ABRT 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 -- cgit v1.2.3-54-g00ecf From 6d01879fe18d30fef10fc0fc6f746569082b3faf Mon Sep 17 00:00:00 2001 From: teor Date: Thu, 11 Apr 2019 12:11:03 +1000 Subject: 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 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 -- cgit v1.2.3-54-g00ecf From 8ff6ab0a399235c081ef4413449581879b7db99b Mon Sep 17 00:00:00 2001 From: teor Date: Thu, 11 Apr 2019 12:17:04 +1000 Subject: changes: file for 30117 --- changes/ticket30117 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/ticket30117 diff --git a/changes/ticket30117 b/changes/ticket30117 new file mode 100644 index 0000000000..5b6e6dabf7 --- /dev/null +++ b/changes/ticket30117 @@ -0,0 +1,4 @@ + o Testing (continuous integration): + - In Travis, tell timelimit to use stem's backtrace signals. And launch + python directly from timelimit, so python receives the signals from + timelimit, rather than make. Closes ticket 30117. -- cgit v1.2.3-54-g00ecf