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

[tor/release-0.2.9] Travis: show chutney logs on chutney job failure
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit b26e3e4c565f4f764ee13a8afd5ea569547bc402 Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:05:26 2019 +1000 Travis: show chutney logs on chutney job failure Part of 29280. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a8ad1f122..cb1351a18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -172,6 +172,7 @@ after_failure: - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi + - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi before_cache: ## Delete all gcov files.

1 0

[tor/release-0.2.9] Travis: remove a redundant os: linux line
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 75f9ae9029b4244658042ce7a4243202bfb4c527 Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:11:25 2019 +1000 Travis: remove a redundant os: linux line Linux is the first item in the os matrix, so we don't need to specify it under matrix: include: . Part of 29280. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 562036e51..190f43bd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,6 @@ matrix: # We also try running a hardened clang build with chutney on Linux. - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" compiler: clang - os: linux ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have

1 0

[tor/release-0.2.9] Travis: show the chutney commit and python version
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit ac7ce179834d8d97342fc17bc385730eccc109a8 Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:10:07 2019 +1000 Travis: show the chutney commit and python version Part of 29280. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index cb1351a18..562036e51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -151,6 +151,10 @@ install: ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi + ## Get python version + - python --version + ## If we're running chutney, show the chutney commit + - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi script: - ./autogen.sh

1 0

[tor/release-0.3.5] 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.3.5] 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.3.5] 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.3.5] Travis: control "make check" with its own flag
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit b0826346a64e58b81e00ec6fcb0d2b75b302c0d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 27 07:51:52 2019 -0500 Travis: control "make check" with its own flag Previously we had "make check" launched whenever DISTCHECK was false. Now we'd like to turn it off in a few other circumstances, like running chutney. Maybe stem too? --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 456b5abc5..a6727923d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ matrix: ## We run coverage with hardening off, which seems like enough # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" + - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -153,7 +153,7 @@ 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" == "" ]]; then make check; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; 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 @@ -163,7 +163,7 @@ after_failure: ## But the log is too long for travis' rendered view, so tail it. - tail -1000 config.log || echo "tail failed" ## `make check` will leave a log file with more details of test failures. - - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi

1 0

[tor/release-0.2.9] 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.3.5] 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/release-0.2.9] Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 8d22c09abf47da229229fe6b5fe355a2da530bef Merge: 518b69b57 75f9ae902 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 10:55:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9 .travis.yml | 18 ++++++++++++++---- changes/chutney_ci | 3 +++ 2 files changed, 17 insertions(+), 4 deletions(-)

1 0