From: Andrea Bolognani Date: Wed, 6 May 2020 09:50:31 +0000 (+0200) Subject: tests: Enable directory override for qemucapsprobe X-Git-Tag: v6.4.0-rc1~161 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bab946e3830ee79f07b76366c05f0f3b4cf1cda2;p=thirdparty%2Flibvirt.git tests: Enable directory override for qemucapsprobe 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 Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrangé --- diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index c7e8f3309d..ea88fd2e8a 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -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;