tor-commits August 2019

tor-commits@lists.torproject.org

19 participants
2737 discussions

[tor/master] Merge branch 'maint-0.4.1'
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 5cbc0b38811064101ac14d37ce3079e784da46e6 Merge: 35cfe2e77 6d0883e9e Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:11:42 2019 +1000 Merge branch 'maint-0.4.1'

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit e83eabc9bfb6c07f80611beb6b02d43102806a0e Merge: 1bc2ae7be 5fda19030 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:17:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5 Merge changed chutney and stem script lines from 29280 with changed stem script lines from 30591. .travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --cc .travis.yml index 66d39f69c,549098439..428c6a000 --- a/.travis.yml +++ b/.travis.yml @@@ -206,11 -209,11 +206,12 @@@ script - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi + - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + - if [[ "$CHUTNEY" != "" ]]; then make test-network-all; 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 --log notice --target RUN_ALL; 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 --log-file stem.log; 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 @@@ -223,8 -226,8 +224,9 @@@ after_failure ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi + - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi - - if [[ "$TEST_STEM" != "" ]]; then cat "$STEM_SOURCE_DIR"/test/data/tor_log || echo "cat failed"; fi + - if [[ "$TEST_STEM" != "" ]]; then tail -1000 "$STEM_SOURCE_DIR"/test/data/tor_log || echo "tail failed"; fi + - if [[ "$TEST_STEM" != "" ]]; then grep -v "SocketClosed" stem.log | tail -1000 || echo "grep | tail failed"; fi before_cache: ## Delete all gcov files.

1 0

[tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 40d7f1e3a67c7777f44e50e009c313baf686e6b2 Merge: 6d0883e9e 0a661cde1 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:19:58 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.1'
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 0acfd7dcee2a4473eba05a53d6df2d6d4fe2050b Merge: 5cbc0b388 40d7f1e3a Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:20:07 2019 +1000 Merge branch 'maint-0.4.1' .travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-)

1 0

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

08 Aug '19

commit 0a661cde1d553116937ff4ea9ac09dbc631d7432 Merge: e27a74b1b e83eabc9b Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:19:38 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/master] Travis: remove sudo configuration
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 8f4840b31a5e7b57143f81d726ddfa474ee216aa Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 24 13:29:23 2019 +0300 Travis: remove sudo configuration See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migrati… --- .travis.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 456b5abc5..2ec94c058 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ env: - matrix: - ## include creates builds with gcc, linux, sudo: false + ## include creates builds with gcc, linux include: ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" @@ -53,12 +53,6 @@ matrix: ## allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… exclude: - ## Clang doesn't work in containerized builds, see below. - - compiler: clang - sudo: false - ## Non-containerized gcc are slow and redundant. - - compiler: gcc - sudo: required ## gcc on OSX is less useful, because the default compiler is clang. - compiler: gcc os: osx @@ -68,20 +62,6 @@ matrix: os: linux env: -## We don't need sudo. (The "apt:" stanza after this allows us to not need -## sudo; otherwise, we would need it for getting dependencies.) -## -## But we use "sudo: required" to force non-containerized builds, working -## around a Travis CI environment issue: clang LeakAnalyzer fails -## because it requires ptrace and the containerized environment no -## longer allows ptrace. -## https://github.com/travis-ci/travis-ci/issues/9033 -## -## In the matrix above, we exclude redundant combinations. -sudo: - - false - - required - ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty

1 0

[tor/master] Travis: only run the stem tests that use a tor binary
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit cdda69ca8ac611802ef2dcf6e5cf60977ab49209 Author: teor <teor(a)torproject.org> Date: Thu May 30 20:05:03 2019 +1000 Travis: only run the stem tests that use a tor binary Closes ticket 30694. --- .travis.yml | 2 +- changes/ticket30694 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d6c838bf..01f155af2 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 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 TRACE --target RUN_ALL; 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 --test control.controller --test control.base_controller --test process --log TRACE; 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 diff --git a/changes/ticket30694 b/changes/ticket30694 new file mode 100644 index 000000000..70dbf6481 --- /dev/null +++ b/changes/ticket30694 @@ -0,0 +1,3 @@ + o Testing (continuous integration): + - In Travis, only run the stem tests that use a tor binary. + Closes ticket 30694.

1 0

[tor/master] Travis: Don't log stem's SocketClosed TRACE logs to the console
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 1cad1f98045260c384c27afb7375ada2b00b4cb9 Author: teor <teor(a)torproject.org> Date: Fri Jun 14 12:13:28 2019 +1000 Travis: Don't log stem's SocketClosed TRACE logs to the console And fix some nearby comments. Part of 30591. --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01f155af2..d5ef6dba2 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

1 0

[tor/master] Travis: make stem log a controller trace, and tail stem's tor log
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 9eb221b2d291fd40d9467517bb7995d8a09f44ce Author: teor <teor(a)torproject.org> Date: Fri May 24 12:06:07 2019 +1000 Travis: make stem log a controller trace, and tail stem's tor log In Travis, make stem log a controller trace to the console. And tail stem's tor log after failure. Closes ticket 30591. --- .travis.yml | 4 ++-- changes/ticket30591 | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b04fa48f..1d6c838bf 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 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 [[ "$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 TRACE --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 @@ -225,7 +225,7 @@ after_failure: ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi - - if [[ "$TEST_STEM" != "" ]]; then cat "$STEM_SOURCE_DIR"/test/data/tor_log || echo "cat failed"; fi + - if [[ "$TEST_STEM" != "" ]]; then tail -1000 "$STEM_SOURCE_DIR"/test/data/tor_log || echo "tail failed"; fi before_cache: ## Delete all gcov files. diff --git a/changes/ticket30591 b/changes/ticket30591 new file mode 100644 index 000000000..f97c02400 --- /dev/null +++ b/changes/ticket30591 @@ -0,0 +1,3 @@ + o Testing (continuous integration): + - In Travis, make stem log a controller trace to the console. And tail + stem's tor log after failure. Closes ticket 30591.

1 0

[tor/master] Add changes file
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 1218546296628fa1538ef98605591bc400415225 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 000000000..acb761480 --- /dev/null +++ b/changes/ticket30213 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Remove sudo configuration lines from .travis.yml as they are no longer + needed with current Travis build environment. Resolves issue 30213.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2019