| Message ID | 20241019184824.1338594-1-raj.khem@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] python3-packaging: Ignore old glibc tests on musl | expand |
Can run-ptest be rewritten to load the list of tests to skip from a file, and then the recipe would add to that file instead? These sed hacks are brittle and barely readable. Alex On Sat, 19 Oct 2024 at 20:48, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote: > > These tests expect glibc to be the system C library > ignore them for musl > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > meta/recipes-devtools/python/python3-packaging_24.1.bb | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/meta/recipes-devtools/python/python3-packaging_24.1.bb b/meta/recipes-devtools/python/python3-packaging_24.1.bb > index 20bcd55fbad..f8465d9fdb7 100644 > --- a/meta/recipes-devtools/python/python3-packaging_24.1.bb > +++ b/meta/recipes-devtools/python/python3-packaging_24.1.bb > @@ -25,6 +25,10 @@ do_install_ptest() { > rm -f ${D}${PTEST_PATH}/tests/manylinux/build.sh > } > > +do_install_ptest:append:libc-musl() { > + sed -i -e '/^pytest/ s|$| --deselect tests/test_manylinux.py::test_is_manylinux_compatible_old --ignore=tests/test_tags.py|' ${D}${PTEST_PATH}/run-ptest > +} > + > RDEPENDS:${PN}-ptest = "\ > python3-ctypes \ > python3-pretend \ > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#206085): https://lists.openembedded.org/g/openembedded-core/message/206085 > Mute This Topic: https://lists.openembedded.org/mt/109104794/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Mon, Oct 21, 2024 at 3:29 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > Can run-ptest be rewritten to load the list of tests to skip from a > file, and then the recipe would add to that file instead? These sed > hacks are brittle and barely readable. Yeah IIRC there is also some pre existing case of doing so I will look into it > > > Alex > > On Sat, 19 Oct 2024 at 20:48, Khem Raj via lists.openembedded.org > <raj.khem=gmail.com@lists.openembedded.org> wrote: > > > > These tests expect glibc to be the system C library > > ignore them for musl > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > --- > > meta/recipes-devtools/python/python3-packaging_24.1.bb | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/meta/recipes-devtools/python/python3-packaging_24.1.bb > b/meta/recipes-devtools/python/python3-packaging_24.1.bb > > index 20bcd55fbad..f8465d9fdb7 100644 > > --- a/meta/recipes-devtools/python/python3-packaging_24.1.bb > > +++ b/meta/recipes-devtools/python/python3-packaging_24.1.bb > > @@ -25,6 +25,10 @@ do_install_ptest() { > > rm -f ${D}${PTEST_PATH}/tests/manylinux/build.sh > > } > > > > +do_install_ptest:append:libc-musl() { > > + sed -i -e '/^pytest/ s|$| --deselect > tests/test_manylinux.py::test_is_manylinux_compatible_old > --ignore=tests/test_tags.py|' ${D}${PTEST_PATH}/run-ptest > > +} > > + > > RDEPENDS:${PN}-ptest = "\ > > python3-ctypes \ > > python3-pretend \ > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#206085): > https://lists.openembedded.org/g/openembedded-core/message/206085 > > Mute This Topic: https://lists.openembedded.org/mt/109104794/1686489 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > alex.kanavin@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > >
diff --git a/meta/recipes-devtools/python/python3-packaging_24.1.bb b/meta/recipes-devtools/python/python3-packaging_24.1.bb index 20bcd55fbad..f8465d9fdb7 100644 --- a/meta/recipes-devtools/python/python3-packaging_24.1.bb +++ b/meta/recipes-devtools/python/python3-packaging_24.1.bb @@ -25,6 +25,10 @@ do_install_ptest() { rm -f ${D}${PTEST_PATH}/tests/manylinux/build.sh } +do_install_ptest:append:libc-musl() { + sed -i -e '/^pytest/ s|$| --deselect tests/test_manylinux.py::test_is_manylinux_compatible_old --ignore=tests/test_tags.py|' ${D}${PTEST_PATH}/run-ptest +} + RDEPENDS:${PN}-ptest = "\ python3-ctypes \ python3-pretend \
These tests expect glibc to be the system C library ignore them for musl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/python/python3-packaging_24.1.bb | 4 ++++ 1 file changed, 4 insertions(+)