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

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 518b69b57cbb33bc382892377d4b1208e14d8a8d Merge: fb977f8ca 121854629 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 10:54:12 2019 +1000 Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9 .travis.yml | 22 +--------------------- changes/ticket30213 | 3 +++ 2 files changed, 4 insertions(+), 21 deletions(-)

1 0

[tor/release-0.4.1] 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/release-0.4.1] 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/release-0.4.1] 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/release-0.4.1] 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/release-0.4.1] 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/release-0.4.1] Travis: Log stem's TRACE logs to a file, and tail it on failure
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 5fda19030930d0609734191911f971e23aa5359c Author: teor <teor(a)torproject.org> Date: Mon Jul 1 13:01:52 2019 +1000 Travis: Log stem's TRACE logs to a file, and tail it on failure Also filter out stem's SocketClosed logs, and fix some nearby comments. Part of 30591. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d5ef6dba2..549098439 100644 --- a/.travis.yml +++ b/.travis.yml @@ -212,7 +212,7 @@ script: - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; 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 [[ "$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 @@ -227,6 +227,7 @@ after_failure: - 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 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/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by teor＠torproject.org 08 Aug '19

08 Aug '19

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

1 0

[tor/release-0.4.1] 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

[tor/release-0.4.1] 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