From nobody Sat Feb 7 07:25:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582381531; cv=none; d=zohomail.com; s=zohoarc; b=Wn8JWwbgZhQd0l4CsEwQYtfCn76kQo4aKTyDkApTVo+CoQfXnvK0kKOEX3W0j/PGCc4qucBvZB3yT/OzWTbPDo97UnPI0MGdG1O2hEIOxrBI1yT0t5jQjpQ01rpvdNXLOu2C5AEYU4aqaWSCtnc97wKvzWw88xDb3SjNo5vTBDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582381531; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9Tcwc9R8/pumXcK72l7jifJnSLt5n5ZGDNqVAuOg8zk=; b=IAgNAys2JLJf04TMLgxXdG5BhG/ACkdYiXsl2CdkPRlAUNOJ+lPOGkYPjF00sPlg+UD/TLRGuKKJF2q4dKUsu4Juy2J3StUj+XHUFi4TPTIf+4TJEBVf+FZOJmDn7vlWw2231CP+0MXs+3Ht4ruMNzu4IEWEpTvzMNthUHJdmZA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1582381531198129.83024593213054; Sat, 22 Feb 2020 06:25:31 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-336-VNaAJ8JUPi2pCWsxMxlUng-1; Sat, 22 Feb 2020 09:25:27 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 21956100726B; Sat, 22 Feb 2020 14:25:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF49427096; Sat, 22 Feb 2020 14:25:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8C7D318034ED; Sat, 22 Feb 2020 14:25:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01MEPKN1008554 for ; Sat, 22 Feb 2020 09:25:20 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3695987B0A; Sat, 22 Feb 2020 14:25:20 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-17.brq.redhat.com [10.40.200.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B10490787 for ; Sat, 22 Feb 2020 14:25:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582381530; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9Tcwc9R8/pumXcK72l7jifJnSLt5n5ZGDNqVAuOg8zk=; b=Y2dtDQbgkeE5pgXcNWK5To50ko+3X5SpXB/ZiBKOvJaQxlBQOspCasirEz+WF2qQwbXzel RPZSUMQDFHoG/BXhsIgP0F8BpjM6wsl53T3Ny+Q9dz0X15MPbPiAMdqHTAbDCIK/KdcjCt c5Fbwv4zcn+2tNdIxsBD+I1pjEfjHL8= X-MC-Unique: VNaAJ8JUPi2pCWsxMxlUng-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/7] libxl: do not mock virFileMakePath Date: Sat, 22 Feb 2020 15:25:09 +0100 Message-Id: <689de8b72a1779610155cdaef8da7d3497d7e4f1.1582381503.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Point the logDir to abs_builddir instead. Signed-off-by: J=C3=A1n Tomko --- tests/libxlmock.c | 11 ----------- tests/testutilsxen.c | 3 +++ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/tests/libxlmock.c b/tests/libxlmock.c index b995b34cc5..60e6b78129 100644 --- a/tests/libxlmock.c +++ b/tests/libxlmock.c @@ -94,17 +94,6 @@ VIR_MOCK_STUB_RET_ARGS(bind, const struct sockaddr *, addr, socklen_t, addrlen) =20 -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, diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c index b1260dcebf..d50c3003da 100644 --- a/tests/testutilsxen.c +++ b/tests/testutilsxen.c @@ -97,6 +97,9 @@ libxlDriverPrivatePtr testXLInitDriver(void) if (!(driver->config =3D libxlDriverConfigNew())) return NULL; =20 + g_free(driver->config->logDir); + driver->config->logDir =3D g_strdup(abs_builddir); + if (libxlDriverConfigInit(driver->config) < 0) return NULL; =20 --=20 2.24.1