Merge branch 'maint-0.4.4'

This commit is contained in:
Nick Mathewson 2020-08-11 11:03:25 -04:00
commit e4ef3c61f7
3 changed files with 7 additions and 2 deletions

4
changes/bug40095 Normal file
View File

@ -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.

View File

@ -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"

View File

@ -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