]> xenbits.xensource.com Git - libvirt.git/commitdiff
tests: Enable directory override for qemucapsprobe
authorAndrea Bolognani <abologna@redhat.com>
Wed, 6 May 2020 09:50:31 +0000 (11:50 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Wed, 6 May 2020 10:32:49 +0000 (12:32 +0200)
Currently, qemucapsprobe fails when libvirt is not already installed
on the system:

  $ ./tests/qemucapsprobe /path/to/qemu-system-ppc64 >/dev/null
  I/O warning : failed to load external entity "/usr/share/libvirt/cpu_map/index.xml"
  2020-05-06 09:49:59.136+0000: 269822: info : libvirt version: 6.4.0
  2020-05-06 09:49:59.136+0000: 269822: info : hostname: [...]
  2020-05-06 09:49:59.136+0000: 269822: warning : virQEMUCapsLogProbeFailure:5127 :
  Failed to probe capabilities for /path/to/qemu-system-ppc64: XML error: failed to
  parse xml document '/usr/share/libvirt/cpu_map/index.xml'

It would be great if the tool could work entirely out of the build
directory, and this patch achieves just that.

Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
tests/qemucapsprobe.c

index c7e8f3309d810578d25ba0d0121ddc4f438701d2..ea88fd2e8ad4991e41e9502cc1aa551e2af68ebd 100644 (file)
@@ -55,6 +55,8 @@ main(int argc, char **argv)
 
     VIR_TEST_PRELOAD(mock);
 
+    virFileActivateDirOverrideForProg(argv[0]);
+
     if (argc != 2) {
         fprintf(stderr, "%s QEMU_binary\n", argv[0]);
         return EXIT_FAILURE;