summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-08-11 11:03:24 -0400
committerNick Mathewson <nickm@torproject.org>2020-08-11 11:03:24 -0400
commit6bee9bd48169f23a3ce713dd30d6b8e2681fa127 (patch)
treeb693873b52ada5b4312b8de32b0d1aec752d26ff
parent262ddfee7a8816b9f7990467df0e495e27f387db (diff)
parentda8577bb7579af1355688d459b2774f995c43b53 (diff)
downloadtor-6bee9bd48169f23a3ce713dd30d6b8e2681fa127.tar.gz
tor-6bee9bd48169f23a3ce713dd30d6b8e2681fa127.zip
Merge branch 'maint-0.4.2' into maint-0.4.3
-rwxr-xr-xscripts/ci/ci-driver.sh4
1 files 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"