From a2a33b767857ff21a2396f5f4db39418d6e5aa45 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 14 Jan 2020 14:59:59 +0100 Subject: busybox: fix failing ptests (From OE-Core rev: d1693ddac0a80664aaf7431b1672391b94696b4f) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 2 ++ meta/recipes-core/busybox/files/run-ptest | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/busybox') diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index bf6ddae7d1..391e4fd163 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -354,6 +354,8 @@ PTEST_BINDIR = "1" do_install_ptest () { cp -r ${B}/testsuite ${D}${PTEST_PATH}/ + # These access the internet which is not guaranteed to work on machines running the tests + rm -rf ${D}${PTEST_PATH}/testsuite/wget cp ${B}/.config ${D}${PTEST_PATH}/ ln -s /bin/busybox ${D}${PTEST_PATH}/busybox } diff --git a/meta/recipes-core/busybox/files/run-ptest b/meta/recipes-core/busybox/files/run-ptest index b19e5b5343..76873c9de2 100644 --- a/meta/recipes-core/busybox/files/run-ptest +++ b/meta/recipes-core/busybox/files/run-ptest @@ -6,4 +6,4 @@ export PATH=$bindir/bin:$PATH export SKIP_KNOWN_BUGS=1 cd testsuite || exit 1 -./runtest -v | sed -r 's/^(SKIPPED|UNTESTED):/SKIP:/' +LANG=C.UTF-8 ./runtest -v | sed -r 's/^(SKIPPED|UNTESTED):/SKIP:/' -- cgit v1.2.3-54-g00ecf