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

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit c6c0af403c9b8dccba96677b60d86670a651893d Merge: da8577bb75 adb7268236 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit c6c0af403c9b8dccba96677b60d86670a651893d Merge: da8577bb75 adb7268236 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.3] CI: label our python versions.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit adb7268236683ed54dedf455598b86596d7ab8ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:24:03 2020 -0400 CI: label our python versions. --- scripts/ci/ci-driver.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 20193e6b2a..ad08ee5af0 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -256,7 +256,9 @@ fi # Tell the user about our versions of different tools and packages. uname -a +printf "python: " python -V || echo "no 'python' binary." +printf "python3: " python3 -V || echo "no 'python3' binary." show_git_version Tor "${CI_SRCDIR}"

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 0ec2d1528cc8f80fe134c37961f8724696468aa9 Merge: 6bee9bd481 c6c0af403c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.2] Fix a pair of typos in ci-driver.sh.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit aa2c93b90b0745a07397538bf7802fba83096b68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 11:03:11 2020 -0400 Fix a pair of typos in ci-driver.sh. --- scripts/ci/ci-driver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index bede68baa8..a675335115 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -257,7 +257,7 @@ fi uname -a python -V || echo "no 'python' binary." -python3 -V || echo "no 'pythone' binary." +python3 -V || echo "no 'python3' binary." show_git_version Tor "${CI_SRCDIR}" if [[ "${STEM}" = "yes" ]]; then @@ -378,7 +378,7 @@ if [[ "${CHECK}" = "yes" ]]; then hooray "make check has succeeded." else error "Here are the contents of the test suite output:" - runcmd cat test_suite.log || true + runcmd cat test-suite.log || true FAILED_TESTS="${FAILED_TESTS} check" fi end_section "Check"

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit da8577bb7579af1355688d459b2774f995c43b53 Merge: e4a6d9d5a9 aa2c93b90b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 11:03:24 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 scripts/ci/ci-driver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit da8577bb7579af1355688d459b2774f995c43b53 Merge: e4a6d9d5a9 aa2c93b90b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 11:03:24 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 scripts/ci/ci-driver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.3] Fix a pair of typos in ci-driver.sh.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit aa2c93b90b0745a07397538bf7802fba83096b68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 11:03:11 2020 -0400 Fix a pair of typos in ci-driver.sh. --- scripts/ci/ci-driver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index bede68baa8..a675335115 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -257,7 +257,7 @@ fi uname -a python -V || echo "no 'python' binary." -python3 -V || echo "no 'pythone' binary." +python3 -V || echo "no 'python3' binary." show_git_version Tor "${CI_SRCDIR}" if [[ "${STEM}" = "yes" ]]; then @@ -378,7 +378,7 @@ if [[ "${CHECK}" = "yes" ]]; then hooray "make check has succeeded." else error "Here are the contents of the test suite output:" - runcmd cat test_suite.log || true + runcmd cat test-suite.log || true FAILED_TESTS="${FAILED_TESTS} check" fi end_section "Check"

1 0

[tor/maint-0.3.5] Fix a pair of typos in ci-driver.sh.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit aa2c93b90b0745a07397538bf7802fba83096b68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 11:03:11 2020 -0400 Fix a pair of typos in ci-driver.sh. --- scripts/ci/ci-driver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index bede68baa8..a675335115 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -257,7 +257,7 @@ fi uname -a python -V || echo "no 'python' binary." -python3 -V || echo "no 'pythone' binary." +python3 -V || echo "no 'python3' binary." show_git_version Tor "${CI_SRCDIR}" if [[ "${STEM}" = "yes" ]]; then @@ -378,7 +378,7 @@ if [[ "${CHECK}" = "yes" ]]; then hooray "make check has succeeded." else error "Here are the contents of the test suite output:" - runcmd cat test_suite.log || true + runcmd cat test-suite.log || true FAILED_TESTS="${FAILED_TESTS} check" fi end_section "Check"

1 0

[tor/maint-0.4.4] Fix "run_check_subsystem_order.sh" to use $PYTHON.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 2a7e71c95656226ed6a7601bddd5b7a804630890 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 11:01:31 2020 -0400 Fix "run_check_subsystem_order.sh" to use $PYTHON. Previously it just used /usr/bin/env/python, which would fail if we only had a "python3" binary. Fixes bug 40095; bugfix on 0.4.4.1-alpha. --- changes/bug40095 | 4 ++++ scripts/maint/run_check_subsystem_order.sh | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug40095 b/changes/bug40095 new file mode 100644 index 0000000000..5c4b3a2b7e --- /dev/null +++ b/changes/bug40095 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - When running the subsystem order check, use the python binary + configured with the PYTHON environment variable. Fixes bug 40095; + bugfix on 0.4.4.1-alpha. diff --git a/scripts/maint/run_check_subsystem_order.sh b/scripts/maint/run_check_subsystem_order.sh index 4ec73bfd56..8e98f1e49c 100755 --- a/scripts/maint/run_check_subsystem_order.sh +++ b/scripts/maint/run_check_subsystem_order.sh @@ -12,6 +12,7 @@ if ! test -x "${INCLUDES_PY}" ; then fi "${TOR}" --dbg-dump-subsystem-list | \ + "${PYTHON:-python}" \ "${INCLUDES_PY}" --check-subsystem-order - "${abs_top_srcdir}/src" echo ok

1 0