summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-09-02 22:03:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-04 20:14:14 +0100
commit13be32f8835139dd22de4ba4f790cd41ad4bb4e7 (patch)
tree14ed9ea034a04310b6e5bc688a7fd5243ca3dbe9
parent7ee50486d188f52c5b8df7bb24c97874fe059344 (diff)
downloadpoky-13be32f8835139dd22de4ba4f790cd41ad4bb4e7.tar.gz
python3: Fix ptests on musl
Adjust locale dependencies to help run tests sadly, tr-tr is not available yet in musl-locale so keep that specific to glibc Add an exclusion list for tests and populate it for musl for the failing tests (From OE-Core rev: db76ac9968ceddc01e48069dbacc212eb4f88574) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3/run-ptest4
-rw-r--r--meta/recipes-devtools/python/python3_3.11.5.bb9
2 files changed, 9 insertions, 4 deletions
diff --git a/meta/recipes-devtools/python/python3/run-ptest b/meta/recipes-devtools/python/python3/run-ptest
index efa84555a5..d1c26c11e2 100644
--- a/meta/recipes-devtools/python/python3/run-ptest
+++ b/meta/recipes-devtools/python/python3/run-ptest
@@ -1,3 +1,3 @@
1#!/bin/sh 1#!/bin/sh
2 2SKIPPED_TESTS=
3{ SETUPTOOLS_USE_DISTUTILS=nonlocal python3 -m test -v -j 4 || echo "FAIL: python3" ; } | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' 3{ SETUPTOOLS_USE_DISTUTILS=nonlocal python3 -m test $SKIPPED_TESTS -v -j 4 || echo "FAIL: python3" ; } | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g'
diff --git a/meta/recipes-devtools/python/python3_3.11.5.bb b/meta/recipes-devtools/python/python3_3.11.5.bb
index 10a4811f64..f5d97311d7 100644
--- a/meta/recipes-devtools/python/python3_3.11.5.bb
+++ b/meta/recipes-devtools/python/python3_3.11.5.bb
@@ -224,6 +224,10 @@ do_install:append:class-nativesdk () {
224 create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1' 224 create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1'
225} 225}
226 226
227do_install_ptest:append:class-target:libc-musl () {
228 sed -i -e 's|SKIPPED_TESTS=|SKIPPED_TESTS="-x test__locale -x test_c_locale_coercion -x test_locale -x test_os test_re -x test__xxsubinterpreters -x test_threading"|' ${D}${PTEST_PATH}/run-ptest
229}
230
227SYSROOT_PREPROCESS_FUNCS:append:class-target = " provide_target_config_script" 231SYSROOT_PREPROCESS_FUNCS:append:class-target = " provide_target_config_script"
228SYSROOT_PREPROCESS_FUNCS:append:class-nativesdk = " provide_target_config_script" 232SYSROOT_PREPROCESS_FUNCS:append:class-nativesdk = " provide_target_config_script"
229 233
@@ -431,8 +435,9 @@ FILES:${PN}-man = "${datadir}/man"
431# See https://bugs.python.org/issue18748 and https://bugs.python.org/issue37395 435# See https://bugs.python.org/issue18748 and https://bugs.python.org/issue37395
432RDEPENDS:libpython3:append:libc-glibc = " libgcc" 436RDEPENDS:libpython3:append:libc-glibc = " libgcc"
433RDEPENDS:${PN}-ctypes:append:libc-glibc = " ${MLPREFIX}ldconfig" 437RDEPENDS:${PN}-ctypes:append:libc-glibc = " ${MLPREFIX}ldconfig"
434RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev ${PN}-cgitb ${PN}-zipapp unzip bzip2 libgcc tzdata coreutils sed gcc g++ binutils" 438RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev ${PN}-cgitb ${PN}-zipapp unzip bzip2 libgcc tzdata coreutils sed gcc g++ binutils \
435RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-fr-fr locale-base-en-us locale-base-tr-tr locale-base-de-de" 439 locale-base-fr-fr locale-base-en-us locale-base-de-de"
440RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-tr-tr"
436RDEPENDS:${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${MLPREFIX}tk ${MLPREFIX}tk-lib', '', d)}" 441RDEPENDS:${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${MLPREFIX}tk ${MLPREFIX}tk-lib', '', d)}"
437RDEPENDS:${PN}-idle += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${PN}-tkinter ${MLPREFIX}tcl', '', d)}" 442RDEPENDS:${PN}-idle += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${PN}-tkinter ${MLPREFIX}tcl', '', d)}"
438DEV_PKG_DEPENDENCY = "" 443DEV_PKG_DEPENDENCY = ""