* [PATCH] tests/check-block.sh: Refuse to run the iotests with BusyBox' sed
@ 2021-01-19 13:47 Thomas Huth
2021-01-19 14:19 ` Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Thomas Huth @ 2021-01-19 13:47 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Daniel P. Berrangé, qemu-block, Max Reitz
BusyBox' sed reports itself as "This is not GNU sed version 4.0"
when being run with the --version parameter. However, the iotests
really need GNU sed, they do not work with the BusyBox version.
So let's make sure that we really have GNU sed and refuse to run
the tests with BusyBox' sed.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/check-block.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tests/check-block.sh b/tests/check-block.sh
index fb4c1baae9..e4f37905be 100755
--- a/tests/check-block.sh
+++ b/tests/check-block.sh
@@ -60,6 +60,13 @@ if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then
echo "GNU sed not available ==> Not running the qemu-iotests."
exit 0
fi
+else
+ # Double-check that we're not using BusyBox' sed which says
+ # that "This is not GNU sed version 4.0" ...
+ if sed --version | grep -q 'not GNU sed' ; then
+ echo "BusyBox sed not supported ==> Not running the qemu-iotests."
+ exit 0
+ fi
fi
cd tests/qemu-iotests
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] tests/check-block.sh: Refuse to run the iotests with BusyBox' sed
2021-01-19 13:47 [PATCH] tests/check-block.sh: Refuse to run the iotests with BusyBox' sed Thomas Huth
@ 2021-01-19 14:19 ` Philippe Mathieu-Daudé
2021-01-19 14:22 ` Daniel P. Berrangé
2021-01-19 15:52 ` Kevin Wolf
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-19 14:19 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Kevin Wolf, Daniel P. Berrangé, qemu-block, Max Reitz
On 1/19/21 2:47 PM, Thomas Huth wrote:
> BusyBox' sed reports itself as "This is not GNU sed version 4.0"
> when being run with the --version parameter. However, the iotests
> really need GNU sed, they do not work with the BusyBox version.
> So let's make sure that we really have GNU sed and refuse to run
> the tests with BusyBox' sed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/check-block.sh | 7 +++++++
> 1 file changed, 7 insertions(+)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/check-block.sh: Refuse to run the iotests with BusyBox' sed
2021-01-19 13:47 [PATCH] tests/check-block.sh: Refuse to run the iotests with BusyBox' sed Thomas Huth
2021-01-19 14:19 ` Philippe Mathieu-Daudé
@ 2021-01-19 14:22 ` Daniel P. Berrangé
2021-01-19 15:52 ` Kevin Wolf
2 siblings, 0 replies; 4+ messages in thread
From: Daniel P. Berrangé @ 2021-01-19 14:22 UTC (permalink / raw)
To: Thomas Huth; +Cc: Kevin Wolf, qemu-devel, qemu-block, Max Reitz
On Tue, Jan 19, 2021 at 02:47:49PM +0100, Thomas Huth wrote:
> BusyBox' sed reports itself as "This is not GNU sed version 4.0"
> when being run with the --version parameter. However, the iotests
> really need GNU sed, they do not work with the BusyBox version.
> So let's make sure that we really have GNU sed and refuse to run
> the tests with BusyBox' sed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/check-block.sh | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/tests/check-block.sh b/tests/check-block.sh
> index fb4c1baae9..e4f37905be 100755
> --- a/tests/check-block.sh
> +++ b/tests/check-block.sh
> @@ -60,6 +60,13 @@ if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then
> echo "GNU sed not available ==> Not running the qemu-iotests."
> exit 0
> fi
> +else
> + # Double-check that we're not using BusyBox' sed which says
> + # that "This is not GNU sed version 4.0" ...
> + if sed --version | grep -q 'not GNU sed' ; then
> + echo "BusyBox sed not supported ==> Not running the qemu-iotests."
> + exit 0
> + fi
> fi
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/check-block.sh: Refuse to run the iotests with BusyBox' sed
2021-01-19 13:47 [PATCH] tests/check-block.sh: Refuse to run the iotests with BusyBox' sed Thomas Huth
2021-01-19 14:19 ` Philippe Mathieu-Daudé
2021-01-19 14:22 ` Daniel P. Berrangé
@ 2021-01-19 15:52 ` Kevin Wolf
2 siblings, 0 replies; 4+ messages in thread
From: Kevin Wolf @ 2021-01-19 15:52 UTC (permalink / raw)
To: Thomas Huth; +Cc: Daniel P. Berrangé, qemu-devel, qemu-block, Max Reitz
Am 19.01.2021 um 14:47 hat Thomas Huth geschrieben:
> BusyBox' sed reports itself as "This is not GNU sed version 4.0"
> when being run with the --version parameter. However, the iotests
> really need GNU sed, they do not work with the BusyBox version.
> So let's make sure that we really have GNU sed and refuse to run
> the tests with BusyBox' sed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-19 15:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-19 13:47 [PATCH] tests/check-block.sh: Refuse to run the iotests with BusyBox' sed Thomas Huth
2021-01-19 14:19 ` Philippe Mathieu-Daudé
2021-01-19 14:22 ` Daniel P. Berrangé
2021-01-19 15:52 ` Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).