]> xenbits.xensource.com Git - libvirt.git/commitdiff
libxl: do not mock virFileMakePath
authorJán Tomko <jtomko@redhat.com>
Sat, 22 Feb 2020 12:12:17 +0000 (13:12 +0100)
committerJán Tomko <jtomko@redhat.com>
Tue, 25 Feb 2020 11:05:00 +0000 (12:05 +0100)
Point the logDir to abs_builddir instead.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
tests/libxlmock.c
tests/testutilsxen.c

index b995b34cc5b2d5497c240f6ed3cf871d61371418..60e6b78129673ec1daf0ec72fa7fa91dadf73b3d 100644 (file)
@@ -94,17 +94,6 @@ VIR_MOCK_STUB_RET_ARGS(bind,
                        const struct sockaddr *, addr,
                        socklen_t, addrlen)
 
-VIR_MOCK_IMPL_RET_ARGS(virFileMakePath, int,
-                       const char *, path)
-{
-    /* replace log path with a writable directory */
-    if (strstr(path, "/log/")) {
-        g_snprintf((char*)path, strlen(path), ".");
-        return 0;
-    }
-    return real_virFileMakePath(path);
-}
-
 VIR_MOCK_IMPL_RET_ARGS(__xstat, int,
                        int, ver,
                        const char *, path,
index b1260dcebff1620afa1cf22539bbaf20f11c3866..d50c3003da96a4ba6e0045f054988bf8f7cb39d4 100644 (file)
@@ -97,6 +97,9 @@ libxlDriverPrivatePtr testXLInitDriver(void)
     if (!(driver->config = libxlDriverConfigNew()))
         return NULL;
 
+    g_free(driver->config->logDir);
+    driver->config->logDir = g_strdup(abs_builddir);
+
     if (libxlDriverConfigInit(driver->config) < 0)
         return NULL;