tor

commit e4ef3c61f7fd718da94deace0b67950c6f788859
parent 0ee3b83a0b77637f51fedc321046fdeaaf5ec15d
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 11 Aug 2020 11:03:25 -0400

Merge branch 'maint-0.4.4'

Diffstat:
A
changes/bug40095
 | 
4
++++
M
scripts/ci/ci-driver.sh
 | 
4
++--
M
scripts/maint/run_check_subsystem_order.sh
 | 
1
+

3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/bug40095 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/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"
diff --git 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