summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-01-08 14:27:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-10 21:18:22 +0000
commit0b1cca70b9b752c8fdf3a6d683455ee4bbed18f9 (patch)
tree6bfe0625d86e110f6b5778c3bd2339d3c6cbb8fe /meta/recipes-core
parent82a9976a66d0f5720cd22da98c4378cab5748cc4 (diff)
downloadpoky-0b1cca70b9b752c8fdf3a6d683455ee4bbed18f9.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. (From OE-Core rev: 9863bb29f481023081b30a55d3304afe1d7b6e8b) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch26
-rw-r--r--meta/recipes-core/gettext/gettext_0.20.1.bb5
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 @@
1From 38b256e5aa7dfeb42acffd89565e53a2c0bab3e3 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 7 Jan 2020 16:44:38 +0100
4Subject: [PATCH] tests/autopoint-3: unset MAKEFLAGS
5
6This is needed when running ptests, as the MAKEFLAGS value (set up by run-ptest)
7is messing up the test.
8
9Upstream-Status: Inapppropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 gettext-tools/tests/autopoint-3 | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3
16index e13552b..55188df 100755
17--- a/gettext-tools/tests/autopoint-3
18+++ b/gettext-tools/tests/autopoint-3
19@@ -126,6 +126,7 @@ test $? = 0 || { cat autopoint.err; Exit 1; }
20 ${CONFIG_SHELL} ./configure >/dev/null 2>autpoint.err
21 test $? = 0 || { cat autopoint.err; Exit 1; }
22
23+unset MAKEFLAGS
24 ${MAKE} >/dev/null 2>autopoint.err
25 test $? = 0 || { cat autopoint.err; Exit 1; }
26
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 \
24 file://run-ptest \ 24 file://run-ptest \
25 file://serial-tests-config.patch \ 25 file://serial-tests-config.patch \
26 file://0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch \ 26 file://0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch \
27 file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \
27 " 28 "
28 29
29SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2" 30SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2"
@@ -150,8 +151,12 @@ do_install_ptest() {
150 mkdir -p ${D}${PTEST_PATH}/misc 151 mkdir -p ${D}${PTEST_PATH}/misc
151 mkdir -p ${D}${PTEST_PATH}/its 152 mkdir -p ${D}${PTEST_PATH}/its
152 mkdir -p ${D}${PTEST_PATH}/styles 153 mkdir -p ${D}${PTEST_PATH}/styles
154 mkdir -p ${D}${PTEST_PATH}/gnulib-lib
155 mkdir -p ${D}${PTEST_PATH}/examples
153 cp -rf ${S}/gettext-tools/its/* ${D}${PTEST_PATH}/its 156 cp -rf ${S}/gettext-tools/its/* ${D}${PTEST_PATH}/its
154 cp -rf ${S}/gettext-tools/styles/* ${D}${PTEST_PATH}/styles 157 cp -rf ${S}/gettext-tools/styles/* ${D}${PTEST_PATH}/styles
158 cp -rf ${S}/gettext-tools/gnulib-lib/gettext.h ${D}${PTEST_PATH}/gnulib-lib
159 cp -rf ${S}/gettext-tools/examples/hello-c ${D}${PTEST_PATH}/examples
155 cp -rf ${S}/gettext-tools/tests/* ${D}${PTEST_PATH}/tests 160 cp -rf ${S}/gettext-tools/tests/* ${D}${PTEST_PATH}/tests
156 cp -rf ${B}/gettext-tools/tests/.libs/* ${D}${PTEST_PATH}/tests 161 cp -rf ${B}/gettext-tools/tests/.libs/* ${D}${PTEST_PATH}/tests
157 cp -rf ${B}/gettext-runtime/intl/.libs/libgnuintl.so.8* ${D}${libdir}/ 162 cp -rf ${B}/gettext-runtime/intl/.libs/libgnuintl.so.8* ${D}${libdir}/