External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix MinGW build for domaincapstest

Browse Source 
Commit 5b9819eedc71 started using the virFileWrapper APIs in
the test program, and correctly called them only in the section
of code guarded by WITH_QEMU; however, a single call to the
virFileWrapperClearPrefixes() function ended up in the
hypervisor-agnostic section, causing a build failure on MinGW.

Move the call to the QEMU-only section; while at it, also drop
the virFileWrapperRemovePrefix() calls, which are entirely
redundant since we'd drop all prefixes immediately afterwards
anyway.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Acked-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Andrea Bolognani 2019-04-10 15:08:46 +02:00
parent 5b9819eedc
commit 947ea8665e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/domaincapstest.c
View File

@ -451,9 +451,7 @@ mymain(void)
"x86_64", VIR_DOMAIN_VIRT_KVM); "x86_64", VIR_DOMAIN_VIRT_KVM);
virObjectUnref(cfg); virObjectUnref(cfg);
virFileWrapperRemovePrefix(SYSCONFDIR "/qemu/firmware"); virFileWrapperClearPrefixes();
virFileWrapperRemovePrefix(PREFIX "/share/qemu/firmware");
virFileWrapperRemovePrefix("/home/user/.config/qemu/firmware");
#endif /* WITH_QEMU */ #endif /* WITH_QEMU */
@ -476,8 +474,6 @@ mymain(void)
DO_TEST_BHYVE("fbuf", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); DO_TEST_BHYVE("fbuf", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE);
#endif /* WITH_BHYVE */ #endif /* WITH_BHYVE */
virFileWrapperClearPrefixes();
return ret; return ret;
} }