From nobody Mon Feb 9 12:29:11 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1711195720501196.46858571580003; Sat, 23 Mar 2024 05:08:40 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4503E21F3; Sat, 23 Mar 2024 08:08:39 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1ACA72291; Sat, 23 Mar 2024 07:39:46 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 866E31D18; Sat, 23 Mar 2024 07:39:32 -0400 (EDT) Received: from mx1.osci.io (polly.osci.io [8.43.85.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 232A11D67 for ; Sat, 23 Mar 2024 07:32:55 -0400 (EDT) Received: by mx1.osci.io (Postfix, from userid 994) id 7005D223BF; Fri, 22 Mar 2024 13:56:33 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by mx1.osci.io (Postfix) with ESMTPS id C20A0223CA for ; Fri, 22 Mar 2024 13:56:32 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-551-ITwxnhknNtGpK4YWG85sPg-1; Fri, 22 Mar 2024 13:56:30 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B8837800264 for ; Fri, 22 Mar 2024 17:56:29 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32130492BD0 for ; Fri, 22 Mar 2024 17:56:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: ITwxnhknNtGpK4YWG85sPg-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 11/35] virshtest: Replace list and nodeinfo tests by equivalent VIR_TEST_SCRIPT variant Date: Fri, 22 Mar 2024 18:55:49 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: IO7ZWYZKQDTK5PFREXX7PVR4GWMKJOTS X-Message-ID-Hash: IO7ZWYZKQDTK5PFREXX7PVR4GWMKJOTS X-MailFrom: SRS0=Xa5W=K4=redhat.com=pkrempa@osci.io X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1711195721605100001 Add the basic list and info commands into a script and run it via VIR_TEST_RUN_SCRIPT to simplify the code and save up on 'virsh' instances exec'd for the test. Signed-off-by: Peter Krempa --- tests/virshtest.c | 79 ++-------------------------- tests/virshtestdata/info-custom.in | 2 + tests/virshtestdata/info-custom.out | 15 ++++++ tests/virshtestdata/info-default.in | 2 + tests/virshtestdata/info-default.out | 13 +++++ 5 files changed, 35 insertions(+), 76 deletions(-) create mode 100644 tests/virshtestdata/info-custom.in create mode 100644 tests/virshtestdata/info-custom.out create mode 100644 tests/virshtestdata/info-default.in create mode 100644 tests/virshtestdata/info-default.out diff --git a/tests/virshtest.c b/tests/virshtest.c index ef2b8e7ec5..cdd5468bc1 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -159,66 +159,6 @@ static char *custom_uri; "--connect", \ custom_uri -static int testCompareListDefault(const void *data) -{ - const char *const argv[] =3D { VIRSH_DEFAULT, "list", NULL }; - const char *exp =3D "\ - Id Name State\n\ -----------------------\n\ - 1 test running\n\ -\n"; - return testCompareOutputLit((const char *) data, exp, NULL, argv); -} - -static int testCompareListCustom(const void *data) -{ - const char *const argv[] =3D { VIRSH_CUSTOM, "list", NULL }; - const char *exp =3D "\ - Id Name State\n\ -----------------------\n\ - 1 fv0 running\n\ - 2 fc4 running\n\ - 3 fc5 running\n\ -\n"; - return testCompareOutputLit((const char *) data, exp, NULL, argv); -} - -static int testCompareNodeinfoDefault(const void *data) -{ - const char *const argv[] =3D { VIRSH_DEFAULT, "nodeinfo", NULL }; - const char *exp =3D "\ -CPU model: i686\n\ -CPU(s): 16\n\ -CPU frequency: 1400 MHz\n\ -CPU socket(s): 2\n\ -Core(s) per socket: 2\n\ -Thread(s) per core: 2\n\ -NUMA cell(s): 2\n\ -Memory size: 3145728 KiB\n\ -\n"; - return testCompareOutputLit((const char *) data, exp, NULL, argv); -} - -static int testCompareNodeinfoCustom(const void *data) -{ - const char *const argv[] =3D { - VIRSH_CUSTOM, - "nodeinfo", - NULL - }; - const char *exp =3D "\ -CPU model: i986\n\ -CPU(s): 50\n\ -CPU frequency: 6000 MHz\n\ -CPU socket(s): 4\n\ -Core(s) per socket: 4\n\ -Thread(s) per core: 2\n\ -NUMA cell(s): 4\n\ -Memory size: 8192000 KiB\n\ -\n"; - return testCompareOutputLit((const char *) data, exp, NULL, argv); -} - static int testCompareDominfoByID(const void *data) { const char *const argv[] =3D { VIRSH_CUSTOM, "dominfo", "2", NULL }; @@ -464,22 +404,6 @@ mymain(void) custom_uri =3D g_strdup_printf("test://%s/../examples/xml/test/testnod= e.xml", abs_srcdir); - if (virTestRun("virsh list (default)", - testCompareListDefault, NULL) !=3D 0) - ret =3D -1; - - if (virTestRun("virsh list (custom)", - testCompareListCustom, NULL) !=3D 0) - ret =3D -1; - - if (virTestRun("virsh nodeinfo (default)", - testCompareNodeinfoDefault, NULL) !=3D 0) - ret =3D -1; - - if (virTestRun("virsh nodeinfo (custom)", - testCompareNodeinfoCustom, NULL) !=3D 0) - ret =3D -1; - if (virTestRun("virsh dominfo (by id)", testCompareDominfoByID, NULL) !=3D 0) ret =3D -1; @@ -580,6 +504,9 @@ mymain(void) ret =3D -1; \ } while (0); + DO_TEST_SCRIPT("info-default", NULL, VIRSH_DEFAULT); + DO_TEST_SCRIPT("info-custom", NULL, VIRSH_CUSTOM); + # define DO_TEST_FULL(testname_, filter, ...) \ do { \ const char *testname =3D testname_; \ diff --git a/tests/virshtestdata/info-custom.in b/tests/virshtestdata/info-= custom.in new file mode 100644 index 0000000000..7767ef1c49 --- /dev/null +++ b/tests/virshtestdata/info-custom.in @@ -0,0 +1,2 @@ +list +nodeinfo diff --git a/tests/virshtestdata/info-custom.out b/tests/virshtestdata/info= -custom.out new file mode 100644 index 0000000000..8307baf4eb --- /dev/null +++ b/tests/virshtestdata/info-custom.out @@ -0,0 +1,15 @@ + Id Name State +---------------------- + 1 fv0 running + 2 fc4 running + 3 fc5 running + +CPU model: i986 +CPU(s): 50 +CPU frequency: 6000 MHz +CPU socket(s): 4 +Core(s) per socket: 4 +Thread(s) per core: 2 +NUMA cell(s): 4 +Memory size: 8192000 KiB + diff --git a/tests/virshtestdata/info-default.in b/tests/virshtestdata/info= -default.in new file mode 100644 index 0000000000..7767ef1c49 --- /dev/null +++ b/tests/virshtestdata/info-default.in @@ -0,0 +1,2 @@ +list +nodeinfo diff --git a/tests/virshtestdata/info-default.out b/tests/virshtestdata/inf= o-default.out new file mode 100644 index 0000000000..56559ab3e4 --- /dev/null +++ b/tests/virshtestdata/info-default.out @@ -0,0 +1,13 @@ + Id Name State +---------------------- + 1 test running + +CPU model: i686 +CPU(s): 16 +CPU frequency: 1400 MHz +CPU socket(s): 2 +Core(s) per socket: 2 +Thread(s) per core: 2 +NUMA cell(s): 2 +Memory size: 3145728 KiB + --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org