From nobody Fri May 16 05:29:44 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1501063351986533.7950358342301; Wed, 26 Jul 2017 03:02:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 824FAC04D2BE; Wed, 26 Jul 2017 10:02:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 626E568893; Wed, 26 Jul 2017 10:02:27 +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 7060C4BB79; Wed, 26 Jul 2017 10:02:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6QA10dd008789 for ; Wed, 26 Jul 2017 06:01:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id B4DC16FE6D; Wed, 26 Jul 2017 10:01:00 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1115B51C89; Wed, 26 Jul 2017 10:00:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 824FAC04D2BE Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 26 Jul 2017 12:00:38 +0200 Message-Id: <1ad4a28e529579312eeccfd4bbdf9792e8302866.1501062802.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 08/24] tests: qemuhelp: convert to virTestLoadFilePath 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: , MIME-Version: 1.0 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 26 Jul 2017 10:02:29 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" As a sample usage of the new helper convert the calls in qemuhelptest to the new helper. --- tests/qemuhelptest.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 7485d2dcd..1a6e7092f 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -44,7 +44,6 @@ static void printMismatchedFlags(virQEMUCapsPtr got, static int testHelpStrParsing(const void *data) { const struct testInfo *info =3D data; - char *path =3D NULL; char *help =3D NULL; unsigned int version, kvm_version; bool is_kvm; @@ -53,10 +52,7 @@ static int testHelpStrParsing(const void *data) char *got =3D NULL; char *expected =3D NULL; - if (virAsprintf(&path, "%s/qemuhelpdata/%s", abs_srcdir, info->name) <= 0) - return -1; - - if (virTestLoadFile(path, &help) < 0) + if (!(help =3D virTestLoadFilePath("qemuhelpdata/", info->name, NULL))) goto cleanup; if (!(flags =3D virQEMUCapsNew())) @@ -76,13 +72,8 @@ static int testHelpStrParsing(const void *data) virQEMUCapsSet(flags, QEMU_CAPS_MONITOR_JSON); # endif - VIR_FREE(path); VIR_FREE(help); - if (virAsprintf(&path, "%s/qemuhelpdata/%s-device", abs_srcdir, - info->name) < 0) - goto cleanup; - - if (virTestLoadFile(path, &help) < 0) + if (!(help =3D virTestLoadFilePath("qemuhelpdata/", info->name, "-devi= ce", NULL))) goto cleanup; if (virQEMUCapsParseDeviceStr(flags, help) < 0) @@ -125,7 +116,6 @@ static int testHelpStrParsing(const void *data) ret =3D 0; cleanup: - VIR_FREE(path); VIR_FREE(help); virObjectUnref(flags); VIR_FREE(got); --=20 2.13.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list