[libvirt PATCH 01/10] remote: use absolute path to check for daemons

Daniel P. Berrangé posted 10 patches 4 years, 8 months ago
[libvirt PATCH 01/10] remote: use absolute path to check for daemons
Posted by Daniel P. Berrangé 4 years, 8 months ago
virFileFindResource needs to be given the absolute build path otherwise
its results will vary according to the CWD, leading to spurious failures
in dev testing.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/remote/remote_daemon_dispatch.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index 1b4f5256c3..13f76cc685 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -2001,7 +2001,9 @@ remoteDispatchProbeURI(bool readonly,
 
             daemonname = g_strdup_printf("virt%sd", drivers[i]);
 
-            if (!(daemonpath = virFileFindResource(daemonname, "src", SBINDIR)))
+            if (!(daemonpath = virFileFindResource(daemonname,
+                                                   abs_top_builddir "/src",
+                                                   SBINDIR)))
                 return -1;
 
             if (!virFileExists(daemonpath)) {
-- 
2.31.1