From nobody Mon Feb 9 19:06:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1555412178; cv=none; d=zoho.com; s=zohoarc; b=JDABcerxjwzoACQqAXHDaK4QE5luOI8dt8fSfIZK0R6MErXWEDbpiutRFPED8ReS8nmwXQL58ept5UGJRiIks/fx5QVX9yPnVA5bmJ1c0JfocPDlF2xbKMYi57Aal9y0VhrCAKUHT4v9dvRZWC51jEH+E9+yDPaJ49EKjnOnrSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555412178; 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:ARC-Authentication-Results; bh=Atf7614co8XG/2n1zahnvfxoeWxdrICr8yRVd0oKvAQ=; b=VUFoEwNW12G714GpZLo1GJaS7W6Wcg/WB7MydamcxXoLRDjwR5iCD2h7eeNU0u6OwU8KytoB1BnQEq3BF92XDl71ahIsC4A/mF81koKqZ4CEh8PuVCpcrxryeKufsH0RrYBIMCOQ0qGPp2/sP/Zz5aqQO4y2GRBha9blRchfWvY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 155541217882727.86555731265844; Tue, 16 Apr 2019 03:56:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3305E804F2; Tue, 16 Apr 2019 10:56:17 +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 090365D9D5; Tue, 16 Apr 2019 10:56:17 +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 B9B38181AC46; Tue, 16 Apr 2019 10:56:16 +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 x3GAuC74016104 for ; Tue, 16 Apr 2019 06:56:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 92135608C7; Tue, 16 Apr 2019 10:56:12 +0000 (UTC) Received: from kinshicho.redhat.com (ovpn-204-253.brq.redhat.com [10.40.204.253]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A3388608A4 for ; Tue, 16 Apr 2019 10:56:11 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 16 Apr 2019 12:56:00 +0200 Message-Id: <20190416105600.1534-5-abologna@redhat.com> In-Reply-To: <20190416105600.1534-1-abologna@redhat.com> References: <20190416105600.1534-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] tests: Use TEST_QEMU_CAPS_PATH wherever possible 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 16 Apr 2019 10:56:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" After the recent changes, there are only a few places left where we use the explicit path instead of taking advantage of the publicly available define; let's get rid of those too. Signed-off-by: Andrea Bolognani --- tests/domaincapstest.c | 4 ++-- tests/qemuargv2xmltest.c | 2 +- tests/qemucapabilitiestest.c | 2 +- tests/qemucaps2xmltest.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index a9922e1edb..f87a1d63fb 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -88,8 +88,8 @@ fillQemuCaps(virDomainCapsPtr domCaps, fakeHostCPU(caps, domCaps->arch) < 0) goto cleanup; =20 - if (virAsprintf(&path, "%s/qemucapabilitiesdata/%s.%s.xml", - abs_srcdir, name, arch) < 0 || + if (virAsprintf(&path, "%s/%s.%s.xml", + TEST_QEMU_CAPS_PATH, name, arch) < 0 || !(qemuCaps =3D qemuTestParseCapabilities(caps, path))) goto cleanup; =20 diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 29c80a0471..2a51e22318 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -156,7 +156,7 @@ mymain(void) do { \ virQEMUCapsPtr qemuCaps; \ qemuCaps =3D qemuTestParseCapabilitiesArch(VIR_ARCH_X86_64, \ - abs_srcdir "/qemucapabili= tiesdata/caps_2.12.0." arch ".xml"); \ + TEST_QEMU_CAPS_PATH "/cap= s_2.12.0." arch ".xml"); \ if (virFileCacheInsertData(driver.qemuCapsCache, \ "/usr/bin/qemu-system-" arch, \ qemuCaps) < 0) \ diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 5477740339..ac9ab6bfce 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -48,7 +48,7 @@ testQemuDataInit(testQemuDataPtr data) if (qemuTestDriverInit(&data->driver) < 0) return -1; =20 - data->dataDir =3D abs_srcdir "/qemucapabilitiesdata"; + data->dataDir =3D TEST_QEMU_CAPS_PATH; =20 data->ret =3D 0; =20 diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 59f676ede1..d107b32221 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -39,7 +39,7 @@ struct _testQemuData { static int testQemuDataInit(testQemuDataPtr data) { - data->inputDir =3D abs_srcdir "/qemucapabilitiesdata"; + data->inputDir =3D TEST_QEMU_CAPS_PATH; data->outputDir =3D abs_srcdir "/qemucaps2xmloutdata"; =20 data->ret =3D 0; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list