From 45392c898b8ba163e95028bd98896e77f0c73806 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Oct 2024 04:04:09 +0100 Subject: gentoo auto-resync : 15:10:2024 - 04:04:09 --- eclass/tests/python-utils-r1.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'eclass/tests') diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 93cea324a3df..732f53381b22 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -64,7 +64,7 @@ tmpfile=$(mktemp) inherit python-utils-r1 -for minor in {10..13}; do +for minor in {10..13} 13t; do ebegin "Testing python3.${minor}" eindent test_var EPYTHON "python3_${minor}" "python3.${minor}" @@ -72,9 +72,9 @@ for minor in {10..13}; do if [[ -x /usr/bin/python3.${minor} ]]; then abiflags=$(/usr/bin/python3.${minor} -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS"))') test_var PYTHON_SITEDIR "python3_${minor}" "/usr/lib*/python3.${minor}/site-packages" - test_var PYTHON_INCLUDEDIR "python3_${minor}" "/usr/include/python3.${minor}${abiflags}" - test_var PYTHON_LIBPATH "python3_${minor}" "/usr/lib*/libpython3.${minor}${abiflags}$(get_libname)" - test_var PYTHON_CONFIG "python3_${minor}" "/usr/bin/python3.${minor}${abiflags}-config" + test_var PYTHON_INCLUDEDIR "python3_${minor}" "/usr/include/python3.${minor%t}${abiflags}" + test_var PYTHON_LIBPATH "python3_${minor}" "/usr/lib*/libpython3.${minor%t}${abiflags}$(get_libname)" + test_var PYTHON_CONFIG "python3_${minor}" "/usr/bin/python3.${minor%t}${abiflags}-config" test_var PYTHON_CFLAGS "python3_${minor}" "*-I/usr/include/python3.${minor}*" test_var PYTHON_LIBS "python3_${minor}" "*-lpython3.${minor}*" fi @@ -105,13 +105,13 @@ for minor in {10..13}; do tend ${?} # these tests apply to py3.8+ only - if [[ ${minor} -ge 8 ]]; then + if [[ ${minor%t} -ge 8 ]]; then tbegin "Testing that _python_verify_patterns accepts stdlib version" - ( _python_verify_patterns "3.${minor}" ) + ( _python_verify_patterns "3.${minor%t}" ) tend ${?} tbegin "Testing _python_impl_matches on stdlib version" - _python_impl_matches "python3_${minor}" "3.${minor}" + _python_impl_matches "python3_${minor}" "3.${minor%t}" tend ${?} fi -- cgit v1.2.3