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

[Jim Fehlig]

On 9/26/18 7:50 AM, Erik Skultety wrote:
> 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.

I had a build worker stumble across this overnight. Sorry for not testing on 
older Xen versions before committing :-(.

>>
>> 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.
> 
> I guess you'd have to maintain a legacy version of the test? I think this
> change is reasonable...

Agreed. We'd need something like

# ifdef LIBXL_HAVE_BUILDINFO_NESTED_HVM
      DO_TEST("vnuma-hvm");
      DO_TEST("fullvirt-cpuid");
# else
      DO_TEST("vuma-hvm-legacy-nest");
      DO_TEST("fullvirt-cpuid-legacy-nest");
# endif

> 
>>
>> 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

Right, but the first release containing LIBXL_HAVE_BUILDINFO_NESTED_HVM was 4.10

git describe --contains 3c44f8ed44a
4.10.0-rc1~222

Since we support xen back to 4.6 I think it is reasonable to have a legacy 
version of the test as Erik suggests. I'll cook up a patch. Thanks for this fix 
in the meantime!

Regards,
Jim

>>
>>   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 at redhat.com>
> 
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
>