[libvirt] [PATCH] tests: libxl: skip tests with nested_hvm

Ján Tomko jtomko at redhat.com
Tue Sep 25 12:48:35 UTC 2018


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 at redhat.com>
---
Technically a build breaker fix, but I'd love to hear any ideas
that would easily let us test both versions.

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
 
     unlink("libxl-driver.log");
 
-- 
2.16.4




More information about the libvir-list mailing list