External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2argvtest: Mark 'nbdkit' tests as skipped if nbdkit is not compiled in

Browse Source 
Rather than completely compiling out the tests mark them as skipped.
This will allow us to add a checker that all input files are accounted
for.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2024-01-03 13:03:24 +01:00
parent ec4d36e558
commit 91116e35b6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/qemuxml2argvtest.c
View File

@ -629,6 +629,15 @@ testCompareXMLToArgv(const void *data)
if (testInfoCheckDuplicate(info) < 0) if (testInfoCheckDuplicate(info) < 0)
goto cleanup; goto cleanup;
# if !WITH_NBDKIT
/* when compiled without nbdkit support we want to skip the test after
* marking it as used */
if (info->args.fakeNbdkitCaps) {
ret = EXIT_AM_SKIP;
goto cleanup;
}
# endif /* !WITH_NBDKIT */
if (info->arch != VIR_ARCH_NONE && info->arch != VIR_ARCH_X86_64) if (info->arch != VIR_ARCH_NONE && info->arch != VIR_ARCH_X86_64)
qemuTestSetHostArch(&driver, info->arch); qemuTestSetHostArch(&driver, info->arch);
@ -908,12 +917,8 @@ mymain(void)
# define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \ # define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \
DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, ARG_END) DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, ARG_END)
# if WITH_NBDKIT
# define DO_TEST_CAPS_LATEST_NBDKIT(name, ...) \ # define DO_TEST_CAPS_LATEST_NBDKIT(name, ...) \
DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", ARG_NBDKIT_CAPS, __VA_ARGS__, QEMU_NBDKIT_CAPS_LAST, ARG_END) DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", ARG_NBDKIT_CAPS, __VA_ARGS__, QEMU_NBDKIT_CAPS_LAST, ARG_END)
# else
# define DO_TEST_CAPS_LATEST_NBDKIT(name, ...)
# endif /* WITH_NBDKIT */
# define DO_TEST_CAPS_LATEST(name) \ # define DO_TEST_CAPS_LATEST(name) \
DO_TEST_CAPS_ARCH_LATEST(name, "x86_64") DO_TEST_CAPS_ARCH_LATEST(name, "x86_64")