elfutils: Remove run-backtrace-dwarf from musl ptest XFAILs list
PATCH 1/3 elfutils: Remove run-backtrace-dwarf from musl ptest XFAILs list
This is passing ok with gcc/libgcc on YP AB
--- meta/recipes-devtools/elfutils/elfutils_0.193.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/elfutils/elfutils_0.193.bb +1 -1
@@ -66,7 +66,7 @@ PTEST_PARALLEL_MAKE = "" PTEST_XFAILS ?= "" # See - https://sourceware.org/bugzilla/show_bug.cgi?id=32232 PTEST_XFAILS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' run-strip-strmerge.sh run-elflint-self.sh run-backtrace-data.sh run-reverse-sections-self.sh', '', d)}" -PTEST_XFAILS:append:libc-musl = " run-large-elf-file.sh run-backtrace-data.sh run-backtrace-dwarf.sh run-backtrace-native.sh run-stack-d-test.sh run-stack-i-test.sh run-stack-demangled-test.sh run-deleted.sh run-compress-test.sh" +PTEST_XFAILS:append:libc-musl = " run-large-elf-file.sh run-backtrace-data.sh run-backtrace-native.sh run-stack-d-test.sh run-stack-i-test.sh run-stack-demangled-test.sh run-deleted.sh run-compress-test.sh" do_install_ptest() { # copy the files which needed by the cases
PATCH 2/3 gettext: Skip test known to fail on musl
* Use posix thread on musl and cache
* Force using system posix complaint printf
* Add coreutils to ptest dependencies
--- ...-tests-needing-BIG5-encoding-on-musl.patch | 84 +++++++++++++++++++ meta/recipes-core/gettext/gettext_0.23.1.bb | 7 +- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/gettext/gettext/0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patch
meta/recipes-core/gettext/gettext/0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patch new file +84 -0
@@ -0,0 +1,84 @@ +From a6e95c626cd52423ca3ff75d47bb2f08b29ad5c8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 21 Aug 2025 13:24:47 -0700 +Subject: [PATCH] Ignore failing tests needing BIG5 encoding on musl + +This test fails on Linux with musl libc +which does not support the BIG5 encoding in 'iconv'. + +Upstream-Status: Inappropriate [Musl-specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + gettext-tools/tests/msgcat-22 | 2 ++ + gettext-tools/tests/msgconv-2 | 2 ++ + gettext-tools/tests/msgconv-8 | 2 ++ + gettext-tools/tests/msgmerge-compendium-6 | 2 ++ + gettext-tools/tests/xgettext-python-3 | 2 ++ + 5 files changed, 10 insertions(+) + +diff --git a/gettext-tools/tests/msgcat-22 b/gettext-tools/tests/msgcat-22 +index 6047188..abe5877 100755 +--- a/gettext-tools/tests/msgcat-22 ++++ b/gettext-tools/tests/msgcat-22 +@@ -6,6 +6,8 @@ + # Note: This test fails on Linux with musl libc versions that don't support + # the GB18030 encoding in 'iconv'. + ++exit 77 ++ + cat <<\EOF > mcat-test22.po + msgid "" + msgstr "" +diff --git a/gettext-tools/tests/msgconv-2 b/gettext-tools/tests/msgconv-2 +index d286cda..b02e1be 100755 +--- a/gettext-tools/tests/msgconv-2 ++++ b/gettext-tools/tests/msgconv-2 +@@ -7,6 +7,8 @@ + # Note: This test fails on Linux with musl libc versions that don't support + # the BIG5 encoding in 'iconv'. + ++exit 77 ++ + cat <<\EOF > mco-test2.po + # Chinese translation for GNU gettext messages. + # +diff --git a/gettext-tools/tests/msgconv-8 b/gettext-tools/tests/msgconv-8 +index 207b0f0..618de0f 100755 +--- a/gettext-tools/tests/msgconv-8 ++++ b/gettext-tools/tests/msgconv-8 +@@ -6,6 +6,8 @@ + # Note: This test fails on Linux with musl libc versions that don't support + # the GB18030 encoding in 'iconv'. + ++exit 77 ++ + cat <<\EOF > mco-test8.po + msgid "" + msgstr "" +diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6 +index 59eb00e..d1d7f0d 100755 +--- a/gettext-tools/tests/msgmerge-compendium-6 ++++ b/gettext-tools/tests/msgmerge-compendium-6 +@@ -10,6 +10,8 @@ + # Note: This test fails on Linux with musl libc versions and on Solaris 11 + # (OpenIndiana, OmniOS) that don't support the EUC-KR encoding in 'iconv'. + ++exit 77 ++ + : ${MSGCONV=msgconv} + ${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot "$wabs_srcdir"/mm-ko.ascii.pot + +diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3 +index 1e13b57..ee1ffee 100755 +--- a/gettext-tools/tests/xgettext-python-3 ++++ b/gettext-tools/tests/xgettext-python-3 +@@ -6,6 +6,8 @@ + # Note: This test fails on Linux with musl libc versions that don't support + # the EUC-JP encoding in 'iconv'. + ++exit 77 ++ + cat <<\EOF > xg-py-3a.py + #!/usr/bin/env python + # TRANSLATORS: Fran���ois Pinard is a hero.
meta/recipes-core/gettext/gettext_0.23.1.bb +6 -1
@@ -27,6 +27,7 @@ SRC_URI += " \ file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ " +SRC_URI:append:libc-musl = " file://0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patch" inherit autotools texinfo pkgconfig ptest
@@ -51,6 +52,10 @@ EXTRA_OECONF:append:class-target = " \ gt_cv_locale_de=de_DE.ISO-8859-1 \ " +EXTRA_OECONF:append:libc-musl = "\ + --enable-threads=posix \ + gt_cv_func_printf_posix=yes \ +" PACKAGECONFIG ??= "glib libxml" PACKAGECONFIG:class-native = "" PACKAGECONFIG:class-nativesdk = ""
@@ -174,7 +179,7 @@ do_install_ptest() { sed -i -e 's|${DEBUG_PREFIX_MAP}||g' ${D}${PTEST_PATH}/tests/init-env } -RDEPENDS:${PN}-ptest += "make xz bash gawk autoconf locale-base-de-de locale-base-fr-fr" +RDEPENDS:${PN}-ptest += "coreutils make xz bash gawk autoconf locale-base-de-de locale-base-fr-fr" RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-gconv-big5 \ glibc-charmap-big5 \
Re: [OE-core] [PATCH 2/3] gettext: Skip test known to fail on musl
meta/recipes-core/gettext/gettext/0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patch
Quoted 16 lines · Khem Raj via lists.openembedded.org
* Use posix thread on musl and cache
* Force using system posix complaint printf
* Add coreutils to ptest dependenciesSigned-off-by Khem Raj <[email protected]>--- ...-tests-needing-BIG5-encoding-on-musl.patch | 84 +++++++++++++++++++ meta/recipes-core/gettext/gettext_0.23.1.bb | 7 +- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/gettext/gettext/0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patchmeta/recipes-core/gettext/gettext/0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patch new file +0
-0
Hi Khem,
I had some patch fuzz with this patch, probably because of the unicode chars on the last line.
I did fix it manually on my branch, and it looks like the issue is gone. So as long as you are fine with this, no action required.
Best regards,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [OE-core] [PATCH 2/3] gettext: Skip test known to fail on musl
Quoted 21 lines · Mathieu Dubois-Briand
meta/recipes-core/gettext/gettext/0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patch
Quoted 16 lines · Khem Raj via lists.openembedded.org
* Use posix thread on musl and cache
* Force using system posix complaint printf
* Add coreutils to ptest dependenciesSigned-off-by Khem Raj <[email protected]>--- ...-tests-needing-BIG5-encoding-on-musl.patch | 84 +++++++++++++++++++ meta/recipes-core/gettext/gettext_0.23.1.bb | 7 +- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/gettext/gettext/0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patchmeta/recipes-core/gettext/gettext/0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patch new file +0
-0Hi Khem,
Quoted 2 lines
I had some patch fuzz with this patch, probably because of the unicode chars on the last line.
hmm, yeah I usually push patches into contrib yoe/mut branch too. Its easier to cherry pick at times since ML may have issues with unicode
etc.
Quoted 6 lines
I did fix it manually on my branch, and it looks like the issue is gone. So as long as you are fine with this, no action required.
looks good. Thanks for taking care of it.
Quoted 8 lines
Best regards,
Mathieu--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Re: [OE-core] [PATCH 2/3] gettext: Skip test known to fail on musl
In reply to Khem Rajmeta/recipes-core/gettext/gettext/0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patch
Quoted 6 lines · Khem Raj via lists.openembedded.org
meta/recipes-core/gettext/gettext/0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patch new file +6
-0+This test fails on Linux with musl libc +which does not support the BIG5 encoding in 'iconv'. + +Upstream-Status: Inappropriate [Musl-specific] ++exit 77 +SRC_URI:append:libc-musl = " file://0001-Ignore-failing-tests-needing-BIG5-encoding-on-musl.patch"
Doing all of this is horrible for maintenance overhead. We're already several gettext versions behind because no one has time or willpower to update, and this makes it worse, not better. If you want to fix tests on musl please do so with a patch that upstream accepts.
Alex
PATCH 3/3 gettext: Force UTF-8 runtime and skip requiring ISO-8859-1
In reply to Khem RajOn musl, there is no real legacy (non-UTF-8) fr_FR locale. These tests are designed for libcs that ship both fr_FR (ISO-8859-1) and fr_FR.UTF-8. So the right thing will be to SKIP these tests
Unsetting LOCALE_FR will ensure that it does not enable ISO-8859-1 path, so reset it in run-ptest but thats not enough because it is being set in the test's own init-env file as well so clear it in that file as well.
Fixes
Failed ptests:
{'gettext': ['intl-2', 'intl-4', 'intl-thread-3', 'lang-sh', 'lang-bash']}
--- meta/recipes-core/gettext/gettext_0.23.1.bb | 10 ++++++++++ 1 file changed, 10 insertions(+)
meta/recipes-core/gettext/gettext_0.23.1.bb +10 -0
@@ -179,6 +179,16 @@ do_install_ptest() { sed -i -e 's|${DEBUG_PREFIX_MAP}||g' ${D}${PTEST_PATH}/tests/init-env } +do_install_ptest:append:libc-musl() { + # Force UTF-8 runtime and skip legacy fr_FR subcases + sed -i '3i export LANG=fr_FR.UTF-8; export LC_ALL=fr_FR.UTF-8' \ + ${D}${PTEST_PATH}/run-ptest + sed -i '3i export LOCALE_FR="none"; export LOCALE_FR_UTF8=fr_FR.UTF-8' \ + ${D}${PTEST_PATH}/run-ptest + sed -i -e 's|^LOCALE_FR="fr_FR.ISO-8859-1"|LOCALE_FR="none"|g' \ + ${D}${PTEST_PATH}/tests/init-env +} + RDEPENDS:${PN}-ptest += "coreutils make xz bash gawk autoconf locale-base-de-de locale-base-fr-fr" RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-gconv-big5 \
Re: [OE-core] [PATCH 3/3] gettext: Force UTF-8 runtime and skip requiring ISO-8859-1
meta/recipes-core/gettext/gettext_0.23.1.bb do_install_ptest() { · line 189
Quoted 8 lines · Khem Raj via lists.openembedded.org
meta/recipes-core/gettext/gettext_0.23.1.bb +8
-0+do_install_ptest:append:libc-musl() { + # Force UTF-8 runtime and skip legacy fr_FR subcases + sed -i '3i export LANG=fr_FR.UTF-8; export LC_ALL=fr_FR.UTF-8' \ + ${D}${PTEST_PATH}/run-ptest + sed -i '3i export LOCALE_FR="none"; export LOCALE_FR_UTF8=fr_FR.UTF-8' \ + ${D}${PTEST_PATH}/run-ptest + sed -i -e 's|^LOCALE_FR="fr_FR.ISO-8859-1"|LOCALE_FR="none"|g' \ + ${D}${PTEST_PATH}/tests/init-env
This hurts my eyes. Can we install a musl-specific run-ptest or raise the issue with upstream, or find some way to avoid all this sed?
Alex