On Tue, Jun 08, 2021 at 07:47:38AM -0500, Eric Blake wrote:
On Tue, Jun 08, 2021 at 09:53:43AM +0200, Martin Kletzander wrote:The version 6.0.0 has very often a bug that makes the test fail, but which should be fixed in later versions. Version 5.1.0 has an issue as well. The version check is not the nicest way to check for this, but is enough.Signed-off-by: Martin Kletzander <[email protected]> asdf Signed-off-by: Martin Kletzander <[email protected]>Bogus line and double s-o-b is odd.
squash leftovers, thanks for noticing
--- interop/interop-qemu-storage-daemon.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/interop/interop-qemu-storage-daemon.sh b/interop/interop-qemu-storage-daemon.sh index 09d1898ef459..dc1efcdf4ca1 100755 --- a/interop/interop-qemu-storage-daemon.sh +++ b/interop/interop-qemu-storage-daemon.sh @@ -23,7 +23,10 @@ set -e set -x requires test "x$QEMU_STORAGE_DAEMON" != "x" -requires $QEMU_STORAGE_DAEMON --version +requires sed --version +qsd_version="$($QEMU_STORAGE_DAEMON --version | sed -n '1s/qemu-storage-daemon version \([0-9.]*\) .*/\1/p')"Long line, you could use backslash-newline to wrap it
Yes, there is also one character to be removed, the space after the version group, because on some systems there is some build info appended and on some the line ends after the micro number of the version.
+requires_not test "$qsd_version" = "6.0.0" +requires_not test "$qsd_version" = "5.1.0"Yeah, a bit ugly (especially once downstreams start shipping a variant of 6.0 with the patch backported), but does the job. Could we instead make it a feature check, by attempting to fire up qemu-storage-daemon with socket activation and checking for the known failure mode?
I guess so, but Rich would be the one to know whether that is testable in some easy way or not, because the only thing I know is that these two versions are, allegedly, broken.
-- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
signature.asc
Description: PGP signature
_______________________________________________ Libguestfs mailing list [email protected] https://listman.redhat.com/mailman/listinfo/libguestfs
