On Tue, Sep 25, 2018 at 02:48:35PM +0200, Ján Tomko wrote: > Commit 95d19cd unconditionally adjusted the tests to account for > the conditional move of the nested_hvm setting location. > > Run the affected tests only for the new setup (witnessed by > LIBXL_HAVE_BUILDINFO_NESTED_HVM). > > Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx> > --- > Technically a build breaker fix, but I'd love to hear any ideas > that would easily let us test both versions. I guess you'd have to maintain a legacy version of the test? I think this change is reasonable... > > Also, my app-emulation/xen-tools-4.9.2-r1 on Gentoo > does not seem to have LIBXL_HAVE_BUILDINFO_NESTED_HVM in libxl.h, > even though it was introduced in 4.9.0-rc7-831-g3c44f8ed44 > > tests/libxlxml2domconfigtest.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c > index 0eba5814b1..6b1f9826d0 100644 > --- a/tests/libxlxml2domconfigtest.c > +++ b/tests/libxlxml2domconfigtest.c > @@ -207,9 +207,16 @@ mymain(void) > DO_TEST("cpu-shares-hvm"); > DO_TEST("variable-clock-hvm"); > DO_TEST("moredevs-hvm"); > + > +# ifdef LIBXL_HAVE_BUILDINFO_NESTED_HVM > DO_TEST("vnuma-hvm"); > +# endif > + > DO_TEST("multiple-ip"); > + > +# ifdef LIBXL_HAVE_BUILDINFO_NESTED_HVM > DO_TEST("fullvirt-cpuid"); > +# endif ...although I'd probably couple those 2 together so that you don't have to ifdef twice, the order of the test doesn't matter after all. With that: Reviewed-by: Erik Skultety <eskultet@xxxxxxxxxx> -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list