diff mbox series

[master,v2] e2fsprogs: removed 'sed -u' option

Message ID 20241021115026.159503-1-Pawan.Badganchi@kpit.com
State Accepted, archived
Commit 07caee1829d2a61bc018fe0e37ecd482922179ee
Headers show
Series [master,v2] e2fsprogs: removed 'sed -u' option | expand

Commit Message

Pawan Badganchi Oct. 21, 2024, 11:50 a.m. UTC
From: Aditya Tayade <Aditya.Tayade@kpit.com>

In embedded box, sed might be provided another providers like Busybox,
hence use generic options whenever possible.
/bin/sed -> /etc/alternatives/sed
/etc/alternatives/sed -> /bin/busybox.nosuid

Here used 'sed -u' option is not necessary, hence removed it.

Fixes below error:
sed: invalid option -- 'u'

Also added 'set -eux' option which halts execution of the script
on any failures.

Signed-off-by: Aditya Tayade <Aditya.Tayade@kpit.com>
Signed-off-by: Pawan Badganchi <Pawan.Badganchi@kpit.com>
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Alexander Kanavin Oct. 21, 2024, 11:53 a.m. UTC | #1
This needs to be accepted for master branch first. Also, dunfell is
EOL and no patches are accepted.

Alex

On Mon, 21 Oct 2024 at 13:50, Pawan Badganchi via
lists.openembedded.org <badganchipv=gmail.com@lists.openembedded.org>
wrote:
>
> From: Aditya Tayade <Aditya.Tayade@kpit.com>
>
> In embedded box, sed might be provided another providers like Busybox,
> hence use generic options whenever possible.
> /bin/sed -> /etc/alternatives/sed
> /etc/alternatives/sed -> /bin/busybox.nosuid
>
> Here used 'sed -u' option is not necessary, hence removed it.
>
> Fixes below error:
> sed: invalid option -- 'u'
>
> Also added 'set -eux' option which halts execution of the script
> on any failures.
>
> Signed-off-by: Aditya Tayade <Aditya.Tayade@kpit.com>
> Signed-off-by: Pawan Badganchi <Pawan.Badganchi@kpit.com>
> ---
>  meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
> index 279923db8e..1857a17189 100644
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
> @@ -1,7 +1,8 @@
>  #!/bin/sh
>
> +set -eux
>  cd ./test
> -SKIP_SLOW_TESTS=yes ./test_script | sed -u -e '/:[[:space:]]ok/s/^/PASS: /' -e '/:[[:space:]]failed/s/^/FAIL: /' -e '/:[[:space:]]skipped/s/^/SKIP: /'
> +SKIP_SLOW_TESTS=yes ./test_script | sed -e '/:[[:space:]]ok/s/^/PASS: /' -e '/:[[:space:]]failed/s/^/FAIL: /' -e '/:[[:space:]]skipped/s/^/SKIP: /'
>  rm -rf /var/volatile/tmp/*e2fsprogs*
>  rm -f tmp-*
>  rm -f *.tmp
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#206115): https://lists.openembedded.org/g/openembedded-core/message/206115
> Mute This Topic: https://lists.openembedded.org/mt/109130461/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
index 279923db8e..1857a17189 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
@@ -1,7 +1,8 @@ 
 #!/bin/sh
 
+set -eux
 cd ./test
-SKIP_SLOW_TESTS=yes ./test_script | sed -u -e '/:[[:space:]]ok/s/^/PASS: /' -e '/:[[:space:]]failed/s/^/FAIL: /' -e '/:[[:space:]]skipped/s/^/SKIP: /'
+SKIP_SLOW_TESTS=yes ./test_script | sed -e '/:[[:space:]]ok/s/^/PASS: /' -e '/:[[:space:]]failed/s/^/FAIL: /' -e '/:[[:space:]]skipped/s/^/SKIP: /'
 rm -rf /var/volatile/tmp/*e2fsprogs*
 rm -f tmp-*
 rm -f *.tmp