From nobody Fri May 3 15:10:23 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551973493138485.4041671460466; Thu, 7 Mar 2019 07:44:53 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5EC36307E071; Thu, 7 Mar 2019 15:44:51 +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 22F801001E69; Thu, 7 Mar 2019 15:44:51 +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 CFD9B181A13B; Thu, 7 Mar 2019 15:44:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x27FigNF018624 for ; Thu, 7 Mar 2019 10:44:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id 980561973C; Thu, 7 Mar 2019 15:44:42 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1958119C72 for ; Thu, 7 Mar 2019 15:44:41 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 16:44:30 +0100 Message-Id: <20190307154437.1405-2-abologna@redhat.com> In-Reply-To: <20190307154437.1405-1-abologna@redhat.com> References: <20190307154437.1405-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/8] tests: Introduce testQemuDataInit() and testQemuDataReset() 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 07 Mar 2019 15:44:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" These functions don't do anything too interesting right now, but will be extended significantly later on. Signed-off-by: Andrea Bolognani --- tests/qemucapabilitiestest.c | 25 ++++++++++++++++++++++--- tests/qemucaps2xmltest.c | 16 ++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 8d47133e6f..882fa57485 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -40,6 +40,23 @@ struct _testQemuData { }; =20 =20 +static int +testQemuDataInit(testQemuDataPtr data) +{ + if (qemuTestDriverInit(&data->driver) < 0) + return -1; + + return 0; +} + + +static void +testQemuDataReset(testQemuDataPtr data) +{ + qemuTestDriverFree(&data->driver); +} + + static int testQemuCaps(const void *opaque) { @@ -164,12 +181,14 @@ mymain(void) return EXIT_AM_SKIP; #endif =20 - if (virThreadInitialize() < 0 || - qemuTestDriverInit(&data.driver) < 0) + if (virThreadInitialize() < 0) return EXIT_FAILURE; =20 virEventRegisterDefaultImpl(); =20 + if (testQemuDataInit(&data) < 0) + return EXIT_FAILURE; + #define DO_TEST(arch, name) \ do { \ data.archName =3D arch; \ @@ -227,7 +246,7 @@ mymain(void) * "tests/qemucapsfixreplies foo.replies" to fix the replies ids. */ =20 - qemuTestDriverFree(&data.driver); + testQemuDataReset(&data); =20 return (ret =3D=3D 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 0d9b4e679a..5cc9fb635b 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -32,6 +32,17 @@ struct _testQemuData { const char *archName; }; =20 +static int +testQemuDataInit(testQemuDataPtr data ATTRIBUTE_UNUSED) +{ + return 0; +} + +static void +testQemuDataReset(testQemuDataPtr data ATTRIBUTE_UNUSED) +{ +} + static virQEMUCapsPtr testQemuGetCaps(char *caps) { @@ -176,6 +187,9 @@ mymain(void) =20 virEventRegisterDefaultImpl(); =20 + if (testQemuDataInit(&data) < 0) + return EXIT_FAILURE; + #define DO_TEST(arch, name) \ data.archName =3D arch; \ data.base =3D name; \ @@ -220,6 +234,8 @@ mymain(void) DO_TEST("riscv64", "caps_3.0.0"); DO_TEST("riscv64", "caps_4.0.0"); =20 + testQemuDataReset(&data); + return (ret =3D=3D 0) ? EXIT_SUCCESS : EXIT_FAILURE; } =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 15:10:23 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551973487826228.091206344115; Thu, 7 Mar 2019 07:44:47 -0800 (PST) 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 02ED23089EC4; Thu, 7 Mar 2019 15:44:46 +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 9AFD45C1B5; Thu, 7 Mar 2019 15:44:45 +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 4FE3C181A12C; Thu, 7 Mar 2019 15:44:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x27FihN0018629 for ; Thu, 7 Mar 2019 10:44:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6F0393DBF; Thu, 7 Mar 2019 15:44:43 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E699C19C72 for ; Thu, 7 Mar 2019 15:44:42 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 16:44:31 +0100 Message-Id: <20190307154437.1405-3-abologna@redhat.com> In-Reply-To: <20190307154437.1405-1-abologna@redhat.com> References: <20190307154437.1405-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/8] tests: Move ret into testQemuData 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 07 Mar 2019 15:44:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This is not particularly useful right now, but will allow us to refactor some functionality later on. Signed-off-by: Andrea Bolognani --- tests/qemucapabilitiestest.c | 10 ++++++---- tests/qemucaps2xmltest.c | 11 ++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 882fa57485..0f875f9e24 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -37,6 +37,7 @@ struct _testQemuData { virQEMUDriver driver; const char *archName; const char *base; + int ret; }; =20 =20 @@ -46,6 +47,8 @@ testQemuDataInit(testQemuDataPtr data) if (qemuTestDriverInit(&data->driver) < 0) return -1; =20 + data->ret =3D 0; + return 0; } =20 @@ -173,7 +176,6 @@ testQemuCapsCopy(const void *opaque) static int mymain(void) { - int ret =3D 0; testQemuData data; =20 #if !WITH_YAJL @@ -194,10 +196,10 @@ mymain(void) data.archName =3D arch; \ data.base =3D name; \ if (virTestRun(name "(" arch ")", testQemuCaps, &data) < 0) \ - ret =3D -1; \ + data.ret =3D -1; \ if (virTestRun("copy " name "(" arch ")", \ testQemuCapsCopy, &data) < 0) \ - ret =3D -1; \ + data.ret =3D -1; \ } while (0) =20 /* Keep this in sync with qemucaps2xmltest */ @@ -248,7 +250,7 @@ mymain(void) =20 testQemuDataReset(&data); =20 - return (ret =3D=3D 0) ? EXIT_SUCCESS : EXIT_FAILURE; + return (data.ret =3D=3D 0) ? EXIT_SUCCESS : EXIT_FAILURE; } =20 VIR_TEST_MAIN(mymain) diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 5cc9fb635b..e9b0b11e35 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -30,11 +30,14 @@ typedef testQemuData *testQemuDataPtr; struct _testQemuData { const char *base; const char *archName; + int ret; }; =20 static int -testQemuDataInit(testQemuDataPtr data ATTRIBUTE_UNUSED) +testQemuDataInit(testQemuDataPtr data) { + data->ret =3D 0; + return 0; } =20 @@ -173,8 +176,6 @@ testQemuCapsXML(const void *opaque) static int mymain(void) { - int ret =3D 0; - testQemuData data; =20 #if !WITH_YAJL @@ -194,7 +195,7 @@ mymain(void) data.archName =3D arch; \ data.base =3D name; \ if (virTestRun(name "(" arch ")", testQemuCapsXML, &data) < 0) \ - ret =3D -1 + data.ret =3D -1 =20 /* Keep this in sync with qemucapabilitiestest */ DO_TEST("x86_64", "caps_1.5.3"); @@ -236,7 +237,7 @@ mymain(void) =20 testQemuDataReset(&data); =20 - return (ret =3D=3D 0) ? EXIT_SUCCESS : EXIT_FAILURE; + return (data.ret =3D=3D 0) ? EXIT_SUCCESS : EXIT_FAILURE; } =20 VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemucaps2xmlmock.so") --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 15:10:23 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551973488046715.355812907027; Thu, 7 Mar 2019 07:44:48 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 230EC309265C; Thu, 7 Mar 2019 15:44:46 +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 E8B9660856; Thu, 7 Mar 2019 15:44:45 +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 B0446181A136; Thu, 7 Mar 2019 15:44:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x27FiiHU018639 for ; Thu, 7 Mar 2019 10:44:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4988F19C69; Thu, 7 Mar 2019 15:44:44 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C180519C72 for ; Thu, 7 Mar 2019 15:44:43 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 16:44:32 +0100 Message-Id: <20190307154437.1405-4-abologna@redhat.com> In-Reply-To: <20190307154437.1405-1-abologna@redhat.com> References: <20190307154437.1405-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/8] tests: Move data directories into testQemuData 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 07 Mar 2019 15:44:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This removes a little duplication right away, and more importantly will allow us to perform some interesting refactoring later on. Signed-off-by: Andrea Bolognani --- tests/qemucapabilitiestest.c | 15 +++++++++------ tests/qemucaps2xmltest.c | 13 +++++++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 0f875f9e24..e3c6681dd4 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -35,6 +35,7 @@ typedef struct _testQemuData testQemuData; typedef testQemuData *testQemuDataPtr; struct _testQemuData { virQEMUDriver driver; + const char *dataDir; const char *archName; const char *base; int ret; @@ -47,6 +48,8 @@ testQemuDataInit(testQemuDataPtr data) if (qemuTestDriverInit(&data->driver) < 0) return -1; =20 + data->dataDir =3D abs_srcdir "/qemucapabilitiesdata"; + data->ret =3D 0; =20 return 0; @@ -73,10 +76,10 @@ testQemuCaps(const void *opaque) unsigned int fakeMicrocodeVersion =3D 0; const char *p; =20 - if (virAsprintf(&repliesFile, "%s/qemucapabilitiesdata/%s.%s.replies", - abs_srcdir, data->base, data->archName) < 0 || - virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml", - abs_srcdir, data->base, data->archName) < 0) + if (virAsprintf(&repliesFile, "%s/%s.%s.replies", + data->dataDir, data->base, data->archName) < 0 || + virAsprintf(&capsFile, "%s/%s.%s.xml", + data->dataDir, data->base, data->archName) < 0) goto cleanup; =20 if (!(mon =3D qemuMonitorTestNewFromFileFull(repliesFile, &data->drive= r, NULL))) @@ -141,8 +144,8 @@ testQemuCapsCopy(const void *opaque) virQEMUCapsPtr copy =3D NULL; char *actual =3D NULL; =20 - if (virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml", - abs_srcdir, data->base, data->archName) < 0) + if (virAsprintf(&capsFile, "%s/%s.%s.xml", + data->dataDir, data->base, data->archName) < 0) goto cleanup; =20 if (!(caps =3D virCapabilitiesNew(virArchFromString(data->archName), diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index e9b0b11e35..46d2ce8b44 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -28,6 +28,8 @@ typedef struct _testQemuData testQemuData; typedef testQemuData *testQemuDataPtr; struct _testQemuData { + const char *inputDir; + const char *outputDir; const char *base; const char *archName; int ret; @@ -36,6 +38,9 @@ struct _testQemuData { static int testQemuDataInit(testQemuDataPtr data) { + data->inputDir =3D abs_srcdir "/qemucapabilitiesdata"; + data->outputDir =3D abs_srcdir "/qemucaps2xmloutdata"; + data->ret =3D 0; =20 return 0; @@ -142,12 +147,12 @@ testQemuCapsXML(const void *opaque) char *capsXml =3D NULL; virCapsPtr capsProvided =3D NULL; =20 - if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/caps.%s.xml", - abs_srcdir, data->archName) < 0) + if (virAsprintf(&xmlFile, "%s/caps.%s.xml", + data->outputDir, data->archName) < 0) goto cleanup; =20 - if (virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml", - abs_srcdir, data->base, data->archName) < 0) + if (virAsprintf(&capsFile, "%s/%s.%s.xml", + data->inputDir, data->base, data->archName) < 0) goto cleanup; =20 if (virTestLoadFile(capsFile, &capsData) < 0) --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 15:10:23 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551973493169405.4760742346558; Thu, 7 Mar 2019 07:44:53 -0800 (PST) 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 53575307EA96; Thu, 7 Mar 2019 15:44:51 +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 2A3FA1718A; Thu, 7 Mar 2019 15:44:51 +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 D4D3C3FA4A; Thu, 7 Mar 2019 15:44:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x27FijKE018647 for ; Thu, 7 Mar 2019 10:44:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id 225FE19C69; Thu, 7 Mar 2019 15:44:45 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A7411973C for ; Thu, 7 Mar 2019 15:44:44 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 16:44:33 +0100 Message-Id: <20190307154437.1405-5-abologna@redhat.com> In-Reply-To: <20190307154437.1405-1-abologna@redhat.com> References: <20190307154437.1405-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/8] tests: Use virAsprintf() to build titles 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 07 Mar 2019 15:44:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We're using static string concatenation at the moment, but that will no longer be a possibility in a bit. Signed-off-by: Andrea Bolognani --- tests/qemucapabilitiestest.c | 11 ++++++++--- tests/qemucaps2xmltest.c | 13 +++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index e3c6681dd4..222ac05d79 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -196,12 +196,17 @@ mymain(void) =20 #define DO_TEST(arch, name) \ do { \ + VIR_AUTOFREE(char *) title =3D NULL; \ + VIR_AUTOFREE(char *) copyTitle =3D NULL; \ + if (virAsprintf(&title, "%s (%s)", name, arch) < 0 || \ + virAsprintf(©Title, "copy %s (%s)", name, arch) < 0) { \ + return -EXIT_FAILURE; \ + } \ data.archName =3D arch; \ data.base =3D name; \ - if (virTestRun(name "(" arch ")", testQemuCaps, &data) < 0) \ + if (virTestRun(title, testQemuCaps, &data) < 0) \ data.ret =3D -1; \ - if (virTestRun("copy " name "(" arch ")", \ - testQemuCapsCopy, &data) < 0) \ + if (virTestRun(copyTitle, testQemuCapsCopy, &data) < 0) \ data.ret =3D -1; \ } while (0) =20 diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 46d2ce8b44..be460b42f8 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -197,10 +197,15 @@ mymain(void) return EXIT_FAILURE; =20 #define DO_TEST(arch, name) \ - data.archName =3D arch; \ - data.base =3D name; \ - if (virTestRun(name "(" arch ")", testQemuCapsXML, &data) < 0) \ - data.ret =3D -1 + do { \ + VIR_AUTOFREE(char *) title =3D NULL; \ + if (virAsprintf(&title, "%s (%s)", name, arch) < 0) \ + return -EXIT_FAILURE; \ + data.archName =3D arch; \ + data.base =3D name; \ + if (virTestRun(title, testQemuCapsXML, &data) < 0) \ + data.ret =3D -1; \ + } while (0) =20 /* Keep this in sync with qemucapabilitiestest */ DO_TEST("x86_64", "caps_1.5.3"); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 15:10:23 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551973493875344.0105116192709; Thu, 7 Mar 2019 07:44:53 -0800 (PST) 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 159C8307E064; Thu, 7 Mar 2019 15:44:52 +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 DD4D65C545; Thu, 7 Mar 2019 15:44:51 +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 9DD9E3FA4B; Thu, 7 Mar 2019 15:44:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x27Fijn6018659 for ; Thu, 7 Mar 2019 10:44:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id F089F19C69; Thu, 7 Mar 2019 15:44:45 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7354119C72 for ; Thu, 7 Mar 2019 15:44:45 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 16:44:34 +0100 Message-Id: <20190307154437.1405-6-abologna@redhat.com> In-Reply-To: <20190307154437.1405-1-abologna@redhat.com> References: <20190307154437.1405-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/8] tests: Move code from DO_TEST() to doCapsTest() 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 07 Mar 2019 15:44:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This removes the awkard escaping and will allow us to perform some interesting refactoring later on. Signed-off-by: Andrea Bolognani --- tests/qemucapabilitiestest.c | 40 +++++++++++++++++++++++++----------- tests/qemucaps2xmltest.c | 28 ++++++++++++++++++------- 2 files changed, 49 insertions(+), 19 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 222ac05d79..b4ed081d3e 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -176,6 +176,32 @@ testQemuCapsCopy(const void *opaque) } =20 =20 +static int +doCapsTest(const char *base, + const char *archName, + testQemuDataPtr data) +{ + VIR_AUTOFREE(char *) title =3D NULL; + VIR_AUTOFREE(char *) copyTitle =3D NULL; + + if (virAsprintf(&title, "%s (%s)", base, archName) < 0 || + virAsprintf(©Title, "copy %s (%s)", base, archName) < 0) { + return -1; + } + + data->base =3D base; + data->archName =3D archName; + + if (virTestRun(title, testQemuCaps, data) < 0) + data->ret =3D -1; + + if (virTestRun(copyTitle, testQemuCapsCopy, data) < 0) + data->ret =3D -1; + + return 0; +} + + static int mymain(void) { @@ -196,18 +222,8 @@ mymain(void) =20 #define DO_TEST(arch, name) \ do { \ - VIR_AUTOFREE(char *) title =3D NULL; \ - VIR_AUTOFREE(char *) copyTitle =3D NULL; \ - if (virAsprintf(&title, "%s (%s)", name, arch) < 0 || \ - virAsprintf(©Title, "copy %s (%s)", name, arch) < 0) { \ - return -EXIT_FAILURE; \ - } \ - data.archName =3D arch; \ - data.base =3D name; \ - if (virTestRun(title, testQemuCaps, &data) < 0) \ - data.ret =3D -1; \ - if (virTestRun(copyTitle, testQemuCapsCopy, &data) < 0) \ - data.ret =3D -1; \ + if (doCapsTest(name, arch, &data) < 0) \ + return EXIT_FAILURE; \ } while (0) =20 /* Keep this in sync with qemucaps2xmltest */ diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index be460b42f8..4f9cfc459e 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -178,6 +178,25 @@ testQemuCapsXML(const void *opaque) return ret; } =20 +static int +doCapsTest(const char *base, + const char *archName, + testQemuDataPtr data) +{ + VIR_AUTOFREE(char *) title =3D NULL; + + if (virAsprintf(&title, "%s (%s)", base, archName) < 0) + return -1; + + data->base =3D base; + data->archName =3D archName; + + if (virTestRun(title, testQemuCapsXML, data) < 0) + data->ret =3D -1; + + return 0; +} + static int mymain(void) { @@ -198,13 +217,8 @@ mymain(void) =20 #define DO_TEST(arch, name) \ do { \ - VIR_AUTOFREE(char *) title =3D NULL; \ - if (virAsprintf(&title, "%s (%s)", name, arch) < 0) \ - return -EXIT_FAILURE; \ - data.archName =3D arch; \ - data.base =3D name; \ - if (virTestRun(title, testQemuCapsXML, &data) < 0) \ - data.ret =3D -1; \ + if (doCapsTest(name, arch, &data) < 0) \ + return EXIT_FAILURE; \ } while (0) =20 /* Keep this in sync with qemucapabilitiestest */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 15:10:23 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15519734983227.48969453468635; Thu, 7 Mar 2019 07:44:58 -0800 (PST) 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 94F8181E0D; Thu, 7 Mar 2019 15:44:56 +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 6DE265C1A1; Thu, 7 Mar 2019 15:44:56 +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 2FB79181A136; Thu, 7 Mar 2019 15:44:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x27FikRu018664 for ; Thu, 7 Mar 2019 10:44:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id CA61119C69; Thu, 7 Mar 2019 15:44:46 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E0AD19C72 for ; Thu, 7 Mar 2019 15:44:46 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 16:44:35 +0100 Message-Id: <20190307154437.1405-7-abologna@redhat.com> In-Reply-To: <20190307154437.1405-1-abologna@redhat.com> References: <20190307154437.1405-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/8] tests: Add testutilsqemu dependency for qemucaps2xmltest 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 07 Mar 2019 15:44:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We're not using any of the functionality offered by the module at the moment, but we will in just a second. Signed-off-by: Andrea Bolognani --- tests/Makefile.am | 1 + tests/qemucaps2xmltest.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 72f0420bab..46fa50cc0a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -639,6 +639,7 @@ qemucommandutiltest_LDADD =3D libqemumonitortestutils.l= a \ qemucaps2xmltest_SOURCES =3D \ qemucaps2xmltest.c \ testutils.c testutils.h \ + testutilsqemu.c testutilsqemu.h \ $(NULL) qemucaps2xmltest_LDADD =3D $(qemu_LDADDS) $(LDADDS) =20 diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 4f9cfc459e..dff4e2a884 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -19,6 +19,7 @@ #include =20 #include "testutils.h" +#include "testutilsqemu.h" #include "qemu/qemu_capabilities.h" =20 =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 15:10:23 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 155197349684428.036765820368373; Thu, 7 Mar 2019 07:44:56 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2CDDC300B915; Thu, 7 Mar 2019 15:44:55 +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 EEE3E60856; Thu, 7 Mar 2019 15:44:54 +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 73CDD3FA4C; Thu, 7 Mar 2019 15:44:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x27Fillp018669 for ; Thu, 7 Mar 2019 10:44:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id A2D5B19C72; Thu, 7 Mar 2019 15:44:47 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2742A19C69 for ; Thu, 7 Mar 2019 15:44:46 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 16:44:36 +0100 Message-Id: <20190307154437.1405-8-abologna@redhat.com> In-Reply-To: <20190307154437.1405-1-abologna@redhat.com> References: <20190307154437.1405-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 7/8] tests: Introduce testQemuCapsIterate() 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 07 Mar 2019 15:44:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This function iterates over a directory containing capabilities-related data, extract some useful bits of information from the file name, and calls a user-provided callback. Signed-off-by: Andrea Bolognani --- tests/testutilsqemu.c | 53 +++++++++++++++++++++++++++++++++++++++++++ tests/testutilsqemu.h | 8 +++++++ 2 files changed, 61 insertions(+) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 61bf67d5ad..407cf91925 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -865,3 +865,56 @@ testQemuGetLatestCapsForArch(const char *dirname, virDirClose(&dir); return ret; } + + +int +testQemuCapsIterate(const char *dirname, + const char *suffix, + testQemuCapsIterateCallback callback, + void *opaque) +{ + struct dirent *ent; + DIR *dir =3D NULL; + int rc; + int ret =3D -1; + + if (!callback) + return 0; + + if (virDirOpen(&dir, dirname) < 0) + goto cleanup; + + while ((rc =3D virDirRead(dir, &ent, dirname) > 0)) { + char *tmp =3D ent->d_name; + char *base =3D NULL; + char *archName =3D NULL; + + /* Strip the trailing suffix, moving on if it's not present */ + if (!virStringStripSuffix(tmp, suffix)) + continue; + + /* Find the last dot, moving on if none is present */ + if (!(archName =3D strrchr(tmp, '.'))) + continue; + + /* The base name is everything before the last dot, and + * the architecture name everything after it */ + base =3D tmp; + archName[0] =3D '\0'; + archName++; + + /* Run the user-provided callback */ + if (callback(base, archName, opaque) < 0) + goto cleanup; + } + + if (rc < 0) + goto cleanup; + + ret =3D 0; + + cleanup: + virDirClose(&dir); + + return ret; +} diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 5ae7f19473..183ce915f1 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -63,6 +63,14 @@ char *testQemuGetLatestCapsForArch(const char *dirname, const char *arch, const char *suffix); =20 +typedef int (*testQemuCapsIterateCallback)(const char *base, + const char *archName, + void *opaque); +int testQemuCapsIterate(const char *dirname, + const char *suffix, + testQemuCapsIterateCallback callback, + void *opaque); + # endif =20 #endif /* LIBVIRT_TESTUTILSQEMU_H */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 15:10:23 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 155197350184523.569986807277814; Thu, 7 Mar 2019 07:45:01 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0027930D78B5; Thu, 7 Mar 2019 15:45:00 +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 CB7941001E79; Thu, 7 Mar 2019 15:44:59 +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 947173FA4C; Thu, 7 Mar 2019 15:44:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x27FimB0018684 for ; Thu, 7 Mar 2019 10:44:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7CB191F2; Thu, 7 Mar 2019 15:44:48 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 00D5B19C69 for ; Thu, 7 Mar 2019 15:44:47 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 16:44:37 +0100 Message-Id: <20190307154437.1405-9-abologna@redhat.com> In-Reply-To: <20190307154437.1405-1-abologna@redhat.com> References: <20190307154437.1405-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 8/8] tests: Use testQemuCapsIterate() 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 07 Mar 2019 15:45:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" With only a couple minor tweaks, we can make the existing doCapsTest() functions with testQemuCapsIterate() and finally remove the need to manually adjust the test programs every time a new input file is introduced; moreover, this means that the two lists can't possibly get out of sync anymore. Signed-off-by: Andrea Bolognani --- tests/qemucapabilitiestest.c | 48 +++--------------------------------- tests/qemucaps2xmltest.c | 48 +++--------------------------------- 2 files changed, 8 insertions(+), 88 deletions(-) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index b4ed081d3e..16c2832ffb 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -179,8 +179,9 @@ testQemuCapsCopy(const void *opaque) static int doCapsTest(const char *base, const char *archName, - testQemuDataPtr data) + void *opaque) { + testQemuDataPtr data =3D (testQemuDataPtr) opaque; VIR_AUTOFREE(char *) title =3D NULL; VIR_AUTOFREE(char *) copyTitle =3D NULL; =20 @@ -220,49 +221,8 @@ mymain(void) if (testQemuDataInit(&data) < 0) return EXIT_FAILURE; =20 -#define DO_TEST(arch, name) \ - do { \ - if (doCapsTest(name, arch, &data) < 0) \ - return EXIT_FAILURE; \ - } while (0) - - /* Keep this in sync with qemucaps2xmltest */ - DO_TEST("x86_64", "caps_1.5.3"); - DO_TEST("x86_64", "caps_1.6.0"); - DO_TEST("x86_64", "caps_1.7.0"); - DO_TEST("x86_64", "caps_2.1.1"); - DO_TEST("x86_64", "caps_2.4.0"); - DO_TEST("x86_64", "caps_2.5.0"); - DO_TEST("x86_64", "caps_2.6.0"); - DO_TEST("x86_64", "caps_2.7.0"); - DO_TEST("x86_64", "caps_2.8.0"); - DO_TEST("x86_64", "caps_2.9.0"); - DO_TEST("x86_64", "caps_2.10.0"); - DO_TEST("x86_64", "caps_2.11.0"); - DO_TEST("x86_64", "caps_2.12.0"); - DO_TEST("x86_64", "caps_3.0.0"); - DO_TEST("x86_64", "caps_3.1.0"); - DO_TEST("x86_64", "caps_4.0.0"); - DO_TEST("aarch64", "caps_2.6.0"); - DO_TEST("aarch64", "caps_2.10.0"); - DO_TEST("aarch64", "caps_2.12.0"); - DO_TEST("ppc64", "caps_2.6.0"); - DO_TEST("ppc64", "caps_2.9.0"); - DO_TEST("ppc64", "caps_2.10.0"); - DO_TEST("ppc64", "caps_2.12.0"); - DO_TEST("ppc64", "caps_3.0.0"); - DO_TEST("ppc64", "caps_3.1.0"); - DO_TEST("s390x", "caps_2.7.0"); - DO_TEST("s390x", "caps_2.8.0"); - DO_TEST("s390x", "caps_2.9.0"); - DO_TEST("s390x", "caps_2.10.0"); - DO_TEST("s390x", "caps_2.11.0"); - DO_TEST("s390x", "caps_2.12.0"); - DO_TEST("s390x", "caps_3.0.0"); - DO_TEST("riscv32", "caps_3.0.0"); - DO_TEST("riscv32", "caps_4.0.0"); - DO_TEST("riscv64", "caps_3.0.0"); - DO_TEST("riscv64", "caps_4.0.0"); + if (testQemuCapsIterate(data.dataDir, ".replies", doCapsTest, &data) <= 0) + return EXIT_FAILURE; =20 /* * Run "tests/qemucapsprobe /path/to/qemu/binary >foo.replies" diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index dff4e2a884..e21fde7e0b 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -182,8 +182,9 @@ testQemuCapsXML(const void *opaque) static int doCapsTest(const char *base, const char *archName, - testQemuDataPtr data) + void *opaque) { + testQemuDataPtr data =3D (testQemuDataPtr) opaque; VIR_AUTOFREE(char *) title =3D NULL; =20 if (virAsprintf(&title, "%s (%s)", base, archName) < 0) @@ -216,49 +217,8 @@ mymain(void) if (testQemuDataInit(&data) < 0) return EXIT_FAILURE; =20 -#define DO_TEST(arch, name) \ - do { \ - if (doCapsTest(name, arch, &data) < 0) \ - return EXIT_FAILURE; \ - } while (0) - - /* Keep this in sync with qemucapabilitiestest */ - DO_TEST("x86_64", "caps_1.5.3"); - DO_TEST("x86_64", "caps_1.6.0"); - DO_TEST("x86_64", "caps_1.7.0"); - DO_TEST("x86_64", "caps_2.1.1"); - DO_TEST("x86_64", "caps_2.4.0"); - DO_TEST("x86_64", "caps_2.5.0"); - DO_TEST("x86_64", "caps_2.6.0"); - DO_TEST("x86_64", "caps_2.7.0"); - DO_TEST("x86_64", "caps_2.8.0"); - DO_TEST("x86_64", "caps_2.9.0"); - DO_TEST("x86_64", "caps_2.10.0"); - DO_TEST("x86_64", "caps_2.11.0"); - DO_TEST("x86_64", "caps_2.12.0"); - DO_TEST("x86_64", "caps_3.0.0"); - DO_TEST("x86_64", "caps_3.1.0"); - DO_TEST("x86_64", "caps_4.0.0"); - DO_TEST("aarch64", "caps_2.6.0"); - DO_TEST("aarch64", "caps_2.10.0"); - DO_TEST("aarch64", "caps_2.12.0"); - DO_TEST("ppc64", "caps_2.6.0"); - DO_TEST("ppc64", "caps_2.9.0"); - DO_TEST("ppc64", "caps_2.10.0"); - DO_TEST("ppc64", "caps_2.12.0"); - DO_TEST("ppc64", "caps_3.0.0"); - DO_TEST("ppc64", "caps_3.1.0"); - DO_TEST("s390x", "caps_2.7.0"); - DO_TEST("s390x", "caps_2.8.0"); - DO_TEST("s390x", "caps_2.9.0"); - DO_TEST("s390x", "caps_2.10.0"); - DO_TEST("s390x", "caps_2.11.0"); - DO_TEST("s390x", "caps_2.12.0"); - DO_TEST("s390x", "caps_3.0.0"); - DO_TEST("riscv32", "caps_3.0.0"); - DO_TEST("riscv32", "caps_4.0.0"); - DO_TEST("riscv64", "caps_3.0.0"); - DO_TEST("riscv64", "caps_4.0.0"); + if (testQemuCapsIterate(data.inputDir, ".xml", doCapsTest, &data) < 0) + return EXIT_FAILURE; =20 testQemuDataReset(&data); =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list