diff options
| -rwxr-xr-x | ci/before_install.sh | 5 | ||||
| -rw-r--r-- | ci/common/test.sh | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ci/before_install.sh b/ci/before_install.sh index 774c66d38f..5cb6894b8c 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -16,13 +16,16 @@ echo 'Python info:' pip3 --version pip2 --version pip --version + + pyenv --version pyenv versions ) 2>&1 | sed 's/^/ /' || true # Use pyenv, but not for OSX on Travis, where it only has the "system" version. if [[ "${TRAVIS_OS_NAME}" != osx ]] && command -v pyenv; then echo 'Setting Python versions via pyenv' - # Prefer python2 as python for /usr/bin/asan_symbolize-4.0. + + # Prefer Python 2 over 3 (more conservative). pyenv global 2.7.15:3.7 echo 'Updated Python info:' diff --git a/ci/common/test.sh b/ci/common/test.sh index c184064236..fb2dcc077e 100644 --- a/ci/common/test.sh +++ b/ci/common/test.sh @@ -69,6 +69,7 @@ check_logs() { for log in $(find "${1}" -type f -name "${2}" -size +0); do cat "${log}" err=1 + rm "${log}" done if test -n "${err}" ; then fail 'logs' E 'Runtime errors detected.' @@ -81,7 +82,7 @@ valgrind_check() { asan_check() { if test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then - check_logs "${1}" "*san.*" | asan_symbolize + check_logs "${1}" "*san.*" fi } |