From 2a7e71c95656226ed6a7601bddd5b7a804630890 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 11 Aug 2020 11:01:31 -0400 Subject: 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(+) create mode 100644 changes/bug40095 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 -- cgit v1.2.3-54-g00ecf From aa2c93b90b0745a07397538bf7802fba83096b68 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 11 Aug 2020 11:03:11 -0400 Subject: 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" -- cgit v1.2.3-54-g00ecf