Commit 6bee9bd4 authored by Nick Mathewson's avatar Nick Mathewson 👁
Browse files

Merge branch 'maint-0.4.2' into maint-0.4.3

parents 262ddfee da8577bb
...@@ -257,7 +257,7 @@ fi ...@@ -257,7 +257,7 @@ fi
uname -a uname -a
python -V || echo "no 'python' binary." python -V || echo "no 'python' binary."
python3 -V || echo "no 'pythone' binary." python3 -V || echo "no 'python3' binary."
show_git_version Tor "${CI_SRCDIR}" show_git_version Tor "${CI_SRCDIR}"
if [[ "${STEM}" = "yes" ]]; then if [[ "${STEM}" = "yes" ]]; then
...@@ -378,7 +378,7 @@ if [[ "${CHECK}" = "yes" ]]; then ...@@ -378,7 +378,7 @@ if [[ "${CHECK}" = "yes" ]]; then
hooray "make check has succeeded." hooray "make check has succeeded."
else else
error "Here are the contents of the test suite output:" 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" FAILED_TESTS="${FAILED_TESTS} check"
fi fi
end_section "Check" end_section "Check"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment