diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2020-01-08 14:27:54 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-10 20:32:04 +0000 |
| commit | 9863bb29f481023081b30a55d3304afe1d7b6e8b (patch) | |
| tree | ac2231145c5ed82d4f901dbfe3d5af47c7aeb948 | |
| parent | a2932a1a386b89d7bae6b2a197279a2dd9e6d76c (diff) | |
| download | openembedded-core-9863bb29f481023081b30a55d3304afe1d7b6e8b.tar.gz | |
gettext: additional ptest fixing
In previous testing some tests were skipped due to missing autotools;
when autotools are present on target, additional failures are exposed.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/gettext/gettext-0.20.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-core/gettext/gettext_0.20.1.bb | 5 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext-0.20.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch new file mode 100644 index 0000000000..96e5bf380f --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.20.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch @@ -0,0 +1,26 @@ +From 38b256e5aa7dfeb42acffd89565e53a2c0bab3e3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 7 Jan 2020 16:44:38 +0100 +Subject: [PATCH] tests/autopoint-3: unset MAKEFLAGS + +This is needed when running ptests, as the MAKEFLAGS value (set up by run-ptest) +is messing up the test. + +Upstream-Status: Inapppropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + gettext-tools/tests/autopoint-3 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3 +index e13552b..55188df 100755 +--- a/gettext-tools/tests/autopoint-3 ++++ b/gettext-tools/tests/autopoint-3 +@@ -126,6 +126,7 @@ test $? = 0 || { cat autopoint.err; Exit 1; } + ${CONFIG_SHELL} ./configure >/dev/null 2>autpoint.err + test $? = 0 || { cat autopoint.err; Exit 1; } + ++unset MAKEFLAGS + ${MAKE} >/dev/null 2>autopoint.err + test $? = 0 || { cat autopoint.err; Exit 1; } + diff --git a/meta/recipes-core/gettext/gettext_0.20.1.bb b/meta/recipes-core/gettext/gettext_0.20.1.bb index ca155fe8bf..09628bc4a3 100644 --- a/meta/recipes-core/gettext/gettext_0.20.1.bb +++ b/meta/recipes-core/gettext/gettext_0.20.1.bb @@ -24,6 +24,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://run-ptest \ file://serial-tests-config.patch \ file://0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch \ + file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ " SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2" @@ -150,8 +151,12 @@ do_install_ptest() { mkdir -p ${D}${PTEST_PATH}/misc mkdir -p ${D}${PTEST_PATH}/its mkdir -p ${D}${PTEST_PATH}/styles + mkdir -p ${D}${PTEST_PATH}/gnulib-lib + mkdir -p ${D}${PTEST_PATH}/examples cp -rf ${S}/gettext-tools/its/* ${D}${PTEST_PATH}/its cp -rf ${S}/gettext-tools/styles/* ${D}${PTEST_PATH}/styles + cp -rf ${S}/gettext-tools/gnulib-lib/gettext.h ${D}${PTEST_PATH}/gnulib-lib + cp -rf ${S}/gettext-tools/examples/hello-c ${D}${PTEST_PATH}/examples cp -rf ${S}/gettext-tools/tests/* ${D}${PTEST_PATH}/tests cp -rf ${B}/gettext-tools/tests/.libs/* ${D}${PTEST_PATH}/tests cp -rf ${B}/gettext-runtime/intl/.libs/libgnuintl.so.8* ${D}${libdir}/ |