summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-04 22:33:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-09 13:44:39 +0100
commit57933bd958cc06722ab7924ec9dc2c72fadc9693 (patch)
tree56756a4436b50dc7b2b2bea12625ad88276a88e6 /meta/recipes-core
parent94123bd09b0d00b1a0ef6a78f74b3c593c8f162d (diff)
downloadpoky-57933bd958cc06722ab7924ec9dc2c72fadc9693.tar.gz
openssh/util-linux/python*: Ensure ptest output is unbuffered
We need to run sed with the -u option to ensure the output is unbuffered else ptest-runner may timeout thinkig things were idle. Busybox doesn't have the -u option so we need to RDEPEND on sed (which is a good thing to do if we use it anyway). Alex Kanavin should get credit for discovering the problem. (From OE-Core rev: d3ffbebf43c23faa43af81c9ecf6fcaef36d675b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc2
-rw-r--r--meta/recipes-core/util-linux/util-linux/run-ptest2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 18c3af240e..c7ba8c446f 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -142,7 +142,7 @@ RDEPENDS_${PN}_class-nativesdk = ""
142RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev ${PN}-libuuid-dev" 142RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev ${PN}-libuuid-dev"
143 143
144RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" 144RDEPENDS_${PN}-bash-completion += "${PN}-lsblk"
145RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" 145RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN} sed"
146RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" 146RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff"
147ALLOW_EMPTY_${PN}-swaponoff = "1" 147ALLOW_EMPTY_${PN}-swaponoff = "1"
148 148
diff --git a/meta/recipes-core/util-linux/util-linux/run-ptest b/meta/recipes-core/util-linux/util-linux/run-ptest
index fbc2f9b56a..8c57bd2074 100644
--- a/meta/recipes-core/util-linux/util-linux/run-ptest
+++ b/meta/recipes-core/util-linux/util-linux/run-ptest
@@ -16,7 +16,7 @@ res=0
16count=0 16count=0
17for ts in $comps; 17for ts in $comps;
18do 18do
19 $ts | sed '{ 19 $ts | sed -u '{
20 s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/ 20 s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/
21 s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/ 21 s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/
22 s/^\(.*\):\(.*\) \.\.\. SKIPPED \(.*\)$/SKIP: \1:\2 \3/ 22 s/^\(.*\):\(.*\) \.\.\. SKIPPED \(.*\)$/SKIP: \1:\2 \3/