gentoo resync : 30.05.2020

2 files changed, 153 insertions, 1 deletions

diff --git a/eclass/tests/llvm.sh b/eclass/tests/llvm.sh
new file mode 100755
index 000000000000..8527d81765dd
--- /dev/null
+++ b/eclass/tests/llvm.sh
@@ -0,0 +1,138 @@
+#!/bin/bash
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+source tests-common.sh
+
+inherit llvm
+
+# llvm_check_deps override to disable has_version use.
+# in: ${LLVM_SLOT}
+# returns 0 if installed (i.e. == LLVM_INSTALLED_SLOT), 1 otherwise
+llvm_check_deps() {
+	[[ ${LLVM_SLOT} == ${LLVM_INSTALLED_SLOT} ]]
+}
+
+# check_prefix <expected> [<args>...]
+# Check output of `get_llvm_prefix <args>...`.
+check_prefix() {
+	local expected=${1}
+	shift
+
+	tbegin "get_llvm_prefix ${*}; inst=${LLVM_INSTALLED_SLOT} -> ${expected}"
+	prefix=$(get_llvm_prefix "${@}")
+	[[ ${prefix} == ${expected} ]] ||
+		eerror "got: ${prefix} != exp: ${expected}"
+	tend ${?}
+}
+
+# check_setup_path <expected>
+# Check PATH after pkg_setup.
+check_setup_path() {
+	local expected=${1}
+	shift
+
+	tbegin "pkg_setup; max=${LLVM_MAX_SLOT}; inst=${LLVM_INSTALLED_SLOT} -> PATH=${expected}"
+	path=$(llvm_pkg_setup; echo "${PATH}")
+	[[ ${path} == ${expected} ]] ||
+		eerror "got: ${path} != exp: ${expected}"
+	tend ${?}
+}
+
+
+EAPI=7
+BROOT=/broot
+SYSROOT=/sysroot
+ESYSROOT=/sysroot/eprefix
+ROOT=/root
+EROOT=/root/eprefix
+
+ebegin "Testing check_setup_path without max slot"
+eindent
+	LLVM_INSTALLED_SLOT=11 \
+	check_prefix /sysroot/eprefix/usr/lib/llvm/11
+	LLVM_INSTALLED_SLOT=10 \
+	check_prefix /sysroot/eprefix/usr/lib/llvm/10
+eoutdent
+
+ebegin "Testing check_setup_path with max slot"
+eindent
+	LLVM_INSTALLED_SLOT=1* \
+	check_prefix /sysroot/eprefix/usr/lib/llvm/11 11
+	LLVM_INSTALLED_SLOT=1* \
+	check_prefix /sysroot/eprefix/usr/lib/llvm/10 10
+	LLVM_INSTALLED_SLOT=10 \
+	check_prefix /sysroot/eprefix/usr/lib/llvm/10 11
+eoutdent
+
+ebegin "Testing check_setup_path option switches"
+eindent
+	LLVM_INSTALLED_SLOT=11 \
+	check_prefix /broot/usr/lib/llvm/11 -b
+	LLVM_INSTALLED_SLOT=11 \
+	check_prefix /sysroot/eprefix/usr/lib/llvm/11 -d
+eoutdent
+
+ebegin "Testing check_setup_path EAPI 6 API"
+eindent
+	EAPI=6 \
+	LLVM_INSTALLED_SLOT=11 \
+	check_prefix /usr/lib/llvm/11 -d
+eoutdent
+
+BASEPATH=/usr/lib/ccache/bin:/usr/bin:/usr/sbin:/bin:/sbin
+
+# TODO: cross support?
+ESYSROOT=
+
+ebegin "Testing pkg_setup with all installed LLVM versions in PATH"
+eindent
+	LLVM_MAX_SLOT=11 \
+	LLVM_INSTALLED_SLOT=1* \
+	PATH=${BASEPATH}:/usr/lib/llvm/11/bin \
+	check_setup_path "${BASEPATH}:/usr/lib/llvm/11/bin"
+
+	LLVM_MAX_SLOT=10 \
+	LLVM_INSTALLED_SLOT=1* \
+	PATH=${BASEPATH}:/usr/lib/llvm/11/bin:/usr/lib/llvm/10/bin \
+	check_setup_path "${BASEPATH}:/usr/lib/llvm/10/bin:/usr/lib/llvm/11/bin"
+
+	LLVM_MAX_SLOT=11 \
+	LLVM_INSTALLED_SLOT=10 \
+	PATH=${BASEPATH}:/usr/lib/llvm/10/bin \
+	check_setup_path "${BASEPATH}:/usr/lib/llvm/10/bin"
+eoutdent
+
+ebegin "Testing pkg_setup with the other LLVM version in PATH"
+eindent
+	LLVM_MAX_SLOT=11 \
+	LLVM_INSTALLED_SLOT=1* \
+	PATH=${BASEPATH}:/usr/lib/llvm/10/bin \
+	check_setup_path "${BASEPATH}:/usr/lib/llvm/11/bin:/usr/lib/llvm/10/bin"
+
+	LLVM_MAX_SLOT=10 \
+	LLVM_INSTALLED_SLOT=1* \
+	PATH=${BASEPATH}:/usr/lib/llvm/11/bin \
+	check_setup_path "${BASEPATH}:/usr/lib/llvm/10/bin:/usr/lib/llvm/11/bin"
+eoutdent
+
+ebegin "Testing pkg_setup with LLVM missing from PATH"
+eindent
+	LLVM_MAX_SLOT=11 \
+	LLVM_INSTALLED_SLOT=1* \
+	PATH=${BASEPATH} \
+	check_setup_path "${BASEPATH}:/usr/lib/llvm/11/bin"
+
+	LLVM_MAX_SLOT=10 \
+	LLVM_INSTALLED_SLOT=1* \
+	PATH=${BASEPATH} \
+	check_setup_path "${BASEPATH}:/usr/lib/llvm/10/bin"
+
+	LLVM_MAX_SLOT=11 \
+	LLVM_INSTALLED_SLOT=10 \
+	PATH=${BASEPATH} \
+	check_setup_path "${BASEPATH}:/usr/lib/llvm/10/bin"
+eoutdent
+
+texit
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index 192c1183e800..86b87ec173d4 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -115,6 +115,20 @@ fi
 test_var PYTHON_PKG_DEP python3_8 '*dev-lang/python*:3.8'
 test_var PYTHON_SCRIPTDIR python3_8 /usr/lib/python-exec/python3.8
 
+test_var EPYTHON python3_9 python3.9
+test_var PYTHON python3_9 /usr/bin/python3.9
+if [[ -x /usr/bin/python3.9 ]]; then
+	abiflags=$(/usr/bin/python3.9 -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS"))')
+	test_var PYTHON_SITEDIR python3_9 "/usr/lib/python3.9/site-packages"
+	test_var PYTHON_INCLUDEDIR python3_9 "/usr/include/python3.9${abiflags}"
+	test_var PYTHON_LIBPATH python3_9 "/usr/lib*/libpython3.9${abiflags}$(get_libname)"
+	test_var PYTHON_CONFIG python3_9 "/usr/bin/python3.9${abiflags}-config"
+	test_var PYTHON_CFLAGS python3_9 "*-I/usr/include/python3.9*"
+	test_var PYTHON_LIBS python3_9 "*-lpython3.9*"
+fi
+test_var PYTHON_PKG_DEP python3_9 '*dev-lang/python*:3.9'
+test_var PYTHON_SCRIPTDIR python3_9 /usr/lib/python-exec/python3.9
+
 test_var EPYTHON pypy3 pypy3
 test_var PYTHON pypy3 /usr/bin/pypy3
 if [[ -x /usr/bin/pypy3 ]]; then