Check whether emulator works before doing sanity check

If the emulator binary can't run, then the sanity check is never going
to work either.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-09-04 10:44:52 +01:00
parent 13e7c30edf
commit af50bf7b78

View File

@ -1408,16 +1408,16 @@ pushd build-dynamic
make check V=1 make check V=1
%endif %endif
# Check the binary runs (see eg RHBZ#998722).
b="./x86_64-softmmu/qemu-system-x86_64"
if [ -x "$b" ]; then "$b" -help; fi
%if %{qemu_sanity_check} %if %{qemu_sanity_check}
# Sanity-check current kernel can boot on this qemu. # Sanity-check current kernel can boot on this qemu.
# The results are advisory only. # The results are advisory only.
qemu-sanity-check --qemu=%{?hostqemu} ||: qemu-sanity-check --qemu=%{?hostqemu} ||:
%endif %endif
# Check the binary runs (see eg RHBZ#998722).
b="./x86_64-softmmu/qemu-system-x86_64"
if [ -x "$b" ]; then "$b" -help; fi
%endif %endif
popd popd
@ -1902,6 +1902,7 @@ getent passwd qemu >/dev/null || \
- Fix host qemu binary path for aarch64 - Fix host qemu binary path for aarch64
- Re-enable kernel BR for QEMU sanity check - Re-enable kernel BR for QEMU sanity check
- Fix conditionals for enabling QEMU sanity check - Fix conditionals for enabling QEMU sanity check
- Check whether emulator works before doing sanity check
* Thu Sep 3 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-4 * Thu Sep 3 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-4
- Add btrfs ioctls to linux-user (rhbz #1872918) - Add btrfs ioctls to linux-user (rhbz #1872918)