diff --git a/virt-v2v.spec b/virt-v2v.spec index b248e34..4ffce39 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -16,7 +16,7 @@ Name: virt-v2v Epoch: 1 Version: 2.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert a virtual machine to run on KVM License: GPLv2+ @@ -85,7 +85,14 @@ BuildRequires: ocaml-gettext-devel BuildRequires: ocaml-ounit-devel %endif +# These are for running our limited test. +BuildRequires: %{_bindir}/qemu-nbd +BuildRequires: %{_bindir}/nbdcopy +BuildRequires: %{_bindir}/nbdinfo +BuildRequires: nbdkit-file-plugin +BuildRequires: nbdkit-null-plugin BuildRequires: nbdkit-python-plugin +BuildRequires: nbdkit-cow-filter >= 1.28.3-1.el9 %if 0%{verify_tarball_signature} BuildRequires: gnupg2 @@ -243,31 +250,27 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1* %check -# All tests fail at the moment because of bugs in libvirt blockdev. -# # Tests fail on both armv7 and ppc64le in Fedora 31 because the kernel -# # cannot boot on qemu. -# %ifnarch %{arm} ppc64le +%ifarch x86_64 +# Only run the tests with non-debug (ie. non-Rawhide) kernels. +# XXX This tests for any debug kernel installed. +if grep CONFIG_DEBUG_MUTEXES=y /lib/modules/*/config ; then + echo "Skipping tests because debug kernel is installed" + exit 0 +fi -# # On x86_64 this single test fails with: "virt-v2v: warning: the -# # target hypervisor does not support a x86_64 KVM guest". Missing -# # BuildRequires? -# %ifarch x86_64 -# truncate -s 0 tests/test-v2v-o-libvirt.sh -# %endif +# Make sure we can see the debug messages (RHBZ#1230160). +export LIBGUESTFS_DEBUG=1 +export LIBGUESTFS_TRACE=1 -# # This test fails in mock. -# truncate -s 0 tests/test-v2v-oa-option.sh - -# # Make sure we can see the debug messages (RHBZ#1230160). -# export LIBGUESTFS_DEBUG=1 -# export LIBGUESTFS_TRACE=1 - -# make %{?_smp_mflags} check || { -# cat tests/test-suite.log -# exit 1 -# } - -# %endif +# The built in tests take a very long time to run under TCG (in Koji), +# so just perform a very simple conversion to check things are +# working. +make -C test-data/phony-guests windows.img +./run virt-v2v -v -x -i disk test-data/phony-guests/windows.img -o null +# XXX Enable in virt-v2v >= 2.1.5 +#make -C test-data/phony-guests fedora.img +#./run virt-v2v -v -x -i disk test-data/phony-guests/fedora.img -o null +%endif %files -f %{name}.lang @@ -309,6 +312,11 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1* %changelog +* Wed Jun 08 2022 Richard W.M. Jones - 1:2.1.4-2 +- Add Requires python3 / platform-python (RHBZ#2094779) +- Remove nbdkit-readahead-filter as it is no longer used +- Enable the tests + * Thu May 26 2022 Richard W.M. Jones - 1:2.1.4-1 - New upstream development version 2.1.4