April 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 17 Apr '19

17 Apr '19

commit c72f0cd5c77ffceb6f0275295c3446a908b17a75 Merge: 15591e1bb 8ff6ab0a3 Author: teor <teor(a)torproject.org> Date: Wed Apr 17 16:46:40 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 2 +- changes/ticket30117 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] changes: file for 30117
by teor＠torproject.org 17 Apr '19

17 Apr '19

commit 8ff6ab0a399235c081ef4413449581879b7db99b Author: teor <teor(a)torproject.org> Date: Thu Apr 11 12:17:04 2019 +1000 changes: file for 30117 --- changes/ticket30117 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket30117 b/changes/ticket30117 new file mode 100644 index 000000000..5b6e6dabf --- /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.

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 17 Apr '19

17 Apr '19

commit c72f0cd5c77ffceb6f0275295c3446a908b17a75 Merge: 15591e1bb 8ff6ab0a3 Author: teor <teor(a)torproject.org> Date: Wed Apr 17 16:46:40 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 2 +- changes/ticket30117 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by teor＠torproject.org 17 Apr '19

17 Apr '19

commit ef97e6c5534c1e0266056aa063f0467d37bd8347 Merge: 82b690d7d c72f0cd5c Author: teor <teor(a)torproject.org> Date: Wed Apr 17 16:46:47 2019 +1000 Merge branch 'maint-0.4.0'

1 0

[tor/release-0.3.5] Travis: use stem backtrace signals with timelimit
by teor＠torproject.org 17 Apr '19

17 Apr '19

commit 6ef38197985326ea7599db6e6abd5efb470ddd04 Author: teor <teor(a)torproject.org> Date: Wed Apr 10 21:15:04 2019 +1000 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 45da26324..144cfe0bd 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

1 0

[tor/release-0.3.5] changes: file for 30117
by teor＠torproject.org 17 Apr '19

17 Apr '19

commit 8ff6ab0a399235c081ef4413449581879b7db99b Author: teor <teor(a)torproject.org> Date: Thu Apr 11 12:17:04 2019 +1000 changes: file for 30117 --- changes/ticket30117 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket30117 b/changes/ticket30117 new file mode 100644 index 000000000..5b6e6dabf --- /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.

1 0

[tor/release-0.3.5] Travis: expand "make test-stem", so timelimit can signal python on timeout
by teor＠torproject.org 17 Apr '19

17 Apr '19

commit 6d01879fe18d30fef10fc0fc6f746569082b3faf Author: teor <teor(a)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

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by teor＠torproject.org 17 Apr '19

17 Apr '19

commit fc3b90b50471039ebbbb209c88ca89ffc4072e74 Merge: e166b66ec 8ff6ab0a3 Author: teor <teor(a)torproject.org> Date: Wed Apr 17 16:46:35 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 .travis.yml | 2 +- changes/ticket30117 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Travis: use stem backtrace signals with timelimit
by teor＠torproject.org 17 Apr '19

17 Apr '19

commit 6ef38197985326ea7599db6e6abd5efb470ddd04 Author: teor <teor(a)torproject.org> Date: Wed Apr 10 21:15:04 2019 +1000 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 45da26324..144cfe0bd 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

1 0

[tor/release-0.4.0] Travis: expand "make test-stem", so timelimit can signal python on timeout
by teor＠torproject.org 17 Apr '19

17 Apr '19

commit 6d01879fe18d30fef10fc0fc6f746569082b3faf Author: teor <teor(a)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

1 0