From 221268735215d5972dd17da01ce906705ab686e0 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 29 Mar 2018 13:27:02 -0700 Subject: libpcre-ptest: skip locale test If a fr_FR locale is found, it is automatically tested. The test will fail if the locale is UTF-8, as the test blindly assumes (and expects) a non-UTF fr_FR locale. The remedy is to skip the test. [YOCTO #12215] (From OE-Core rev: 4cedddb83623c79980b354642dfeaf78218ca4b7) Signed-off-by: Juro Bystricky Signed-off-by: Richard Purdie --- meta/recipes-support/libpcre/libpcre_8.41.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/libpcre/libpcre_8.41.bb b/meta/recipes-support/libpcre/libpcre_8.41.bb index 0eaed1808a..0187c08f50 100644 --- a/meta/recipes-support/libpcre/libpcre_8.41.bb +++ b/meta/recipes-support/libpcre/libpcre_8.41.bb @@ -80,4 +80,8 @@ do_install_ptest() { for i in RunTest RunGrepTest test-driver; \ do cp ${S}/$i $t; \ done + # Skip the fr_FR locale test. If the locale fr_FR is found, it is tested. + # If not found, the test is skipped. The test program assumes fr_FR is non-UTF-8 + # locale so the test fails if fr_FR is UTF-8 locale. + sed -i -e 's:do3=yes:do3=no:g' ${D}${PTEST_PATH}/RunTest } -- cgit v1.2.3-54-g00ecf