]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
tests: Fix MinGW build for domaincapstest
authorAndrea Bolognani <abologna@redhat.com>
Wed, 10 Apr 2019 13:08:46 +0000 (15:08 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Wed, 10 Apr 2019 14:08:13 +0000 (16:08 +0200)
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>
tests/domaincapstest.c

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