From 85b34350c60e8a5380a48505eefd111a158e6f84 Mon Sep 17 00:00:00 2001 From: Phil Jaenke Date: Fri, 24 Jan 2020 18:16:44 -0500 Subject: Fix for failing compile-runtime-tests (#18569) compile-runtime-tests is looking for python3, but $(env python3) will return error (no `/usr/local/bin/python3`); if this is the case, create a symlink from 3.6 or 3.7 to /usr/local/bin/python3 so it works. We already have this listed in `SHEBANG_FILES` for the port. --- scripts/ci/provisioning/freebsd.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'scripts/ci') diff --git a/scripts/ci/provisioning/freebsd.sh b/scripts/ci/provisioning/freebsd.sh index c43762cffd9..10398b030d2 100755 --- a/scripts/ci/provisioning/freebsd.sh +++ b/scripts/ci/provisioning/freebsd.sh @@ -30,7 +30,7 @@ if ! pkg info > /dev/null; then fi ## These packages are MUST have. -if ! pkg install -y bash git gmake autoconf automake cmake libtool python27 python36 ca_root_nss; then +if ! pkg install -y bash git gmake autoconf automake cmake libtool python36 ca_root_nss; then ## Kill the attempt quickly if we definitely cannot build. echo "[FATAL] Error installing critical packages. Aborting because building is impossible." exit 1 @@ -49,6 +49,16 @@ fi # for compatibility with the mono build scripts, ideally shouldn't be necessary ln -s /usr/local/bin/bash /bin/bash +# fix for gen-descriptor-tests.py +if ! $(env python3) ; then + if [ -f /usr/local/bin/python3.7 ]; then + ln -s /usr/local/bin/python3.7 /usr/local/bin/python3 + elif [ -f /usr/local/bin/python3.6 ]; then + ln -s /usr/local/bin/python3.6 /usr/local/bin/python3 + else + echo "[NOTICE] Some tests will fail due to calling python3 explicitly." + fi +fi ## Do not remove, instead rename; otherwise it's impossible to support ports infrastructure testing mv /usr/bin/make /usr/bin/bsdmake && ln -s /usr/local/bin/gmake /usr/bin/make -- cgit v1.2.3