From nobody Fri Apr 26 22:16:55 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 1548946503310637.6584288828676; Thu, 31 Jan 2019 06:55:03 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 93E2DC05D40D; Thu, 31 Jan 2019 14:54:59 +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 4428219C7B; Thu, 31 Jan 2019 14:54: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 EB69D3F605; Thu, 31 Jan 2019 14:54:57 +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 x0VEssln030874 for ; Thu, 31 Jan 2019 09:54:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id 16CA417B6C; Thu, 31 Jan 2019 14:54:54 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91FF01834A for ; Thu, 31 Jan 2019 14:54:53 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 31 Jan 2019 15:54:45 +0100 Message-Id: <6907443e44cecc7fa4f795d3b6ae31fa1ef3813f.1548946468.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] storagepoolxml2argvtest: pass the platform suffix as a string 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-Type: text/plain; charset="utf-8" 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 31 Jan 2019 14:55:00 +0000 (UTC) Instead of a pair of bools. Signed-off-by: J=C3=A1n Tomko --- tests/storagepoolxml2argvtest.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtes= t.c index 786fb26402..2c5e385d2b 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -96,8 +96,7 @@ testCompareXMLToArgvFiles(bool shouldFail, struct testInfo { bool shouldFail; const char *pool; - bool linuxOut; - bool freebsdOut; + const char *platformSuffix; }; =20 static int @@ -112,19 +111,10 @@ testCompareXMLToArgvHelper(const void *data) abs_srcdir, info->pool) < 0) goto cleanup; =20 - if (info->linuxOut) { - if (virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s-linux.arg= v", - abs_srcdir, info->pool) < 0 && !info->shouldFail) - goto cleanup; - } else if (info->freebsdOut) { - if (virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s-freebsd.a= rgv", - abs_srcdir, info->pool) < 0 && !info->shouldFail) - goto cleanup; - } else { - if (virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s.argv", - abs_srcdir, info->pool) < 0 && !info->shouldFail) - goto cleanup; - } + if (virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s%s.argv", + abs_srcdir, info->pool, info->platformSuffix) < 0 && + !info->shouldFail) + goto cleanup; =20 result =3D testCompareXMLToArgvFiles(info->shouldFail, poolxml, cmdlin= e); =20 @@ -141,9 +131,9 @@ mymain(void) { int ret =3D 0; =20 -#define DO_TEST_FULL(shouldFail, pool, linuxOut, freebsdOut) \ +#define DO_TEST_FULL(shouldFail, pool, platformSuffix) \ do { \ - struct testInfo info =3D { shouldFail, pool, linuxOut, freebsdOut = }; \ + struct testInfo info =3D { shouldFail, pool, platformSuffix }; \ if (virTestRun("Storage Pool XML-2-argv " pool, \ testCompareXMLToArgvHelper, &info) < 0) \ ret =3D -1; \ @@ -151,16 +141,16 @@ mymain(void) while (0); =20 #define DO_TEST(pool, ...) \ - DO_TEST_FULL(false, pool, false, false) + DO_TEST_FULL(false, pool, "") =20 #define DO_TEST_FAIL(pool, ...) \ - DO_TEST_FULL(true, pool, false, false) + DO_TEST_FULL(true, pool, "") =20 #define DO_TEST_LINUX(pool, ...) \ - DO_TEST_FULL(false, pool, true, false) + DO_TEST_FULL(false, pool, "-linux") =20 #define DO_TEST_FREEBSD(pool, ...) \ - DO_TEST_FULL(false, pool, false, true) + DO_TEST_FULL(false, pool, "-freebsd") =20 if (storageRegisterAll() < 0) return EXIT_FAILURE; --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 22:16:55 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 1548946530346358.6892965545487; Thu, 31 Jan 2019 06:55:30 -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 CF7F612F91B; Thu, 31 Jan 2019 14:55:13 +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 7E640104811B; Thu, 31 Jan 2019 14:55:13 +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 19CEC180BAAC; Thu, 31 Jan 2019 14:55:13 +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 x0VEssPg030882 for ; Thu, 31 Jan 2019 09:54:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id DD1321710F; Thu, 31 Jan 2019 14:54:54 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 642A01834A for ; Thu, 31 Jan 2019 14:54:54 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 31 Jan 2019 15:54:46 +0100 Message-Id: <4dd5e96d82ab0c1cbc8e2084c6235506771ffbaf.1548946468.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] storagepoolxml2argvtest: introduce DO_TEST_PLATFORM 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-Type: text/plain; charset="utf-8" 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.38]); Thu, 31 Jan 2019 14:55:15 +0000 (UTC) Instead of repeating the same platform for every test, set it once, since we do the same tests with the same input for all platforms, it's just the output that differs. Signed-off-by: J=C3=A1n Tomko --- tests/storagepoolxml2argvtest.c | 48 ++++++++++++++++---------------------= ---- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtes= t.c index 2c5e385d2b..0b2c2e4f98 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -130,6 +130,13 @@ static int mymain(void) { int ret =3D 0; +#ifdef __linux__ + const char *platform =3D "-linux"; +#elif defined(__FreeBSD__) + const char *platform =3D "-freebsd"; +#else + const char *platform =3D ""; +#endif =20 #define DO_TEST_FULL(shouldFail, pool, platformSuffix) \ do { \ @@ -146,11 +153,8 @@ mymain(void) #define DO_TEST_FAIL(pool, ...) \ DO_TEST_FULL(true, pool, "") =20 -#define DO_TEST_LINUX(pool, ...) \ - DO_TEST_FULL(false, pool, "-linux") - -#define DO_TEST_FREEBSD(pool, ...) \ - DO_TEST_FULL(false, pool, "-freebsd") +#define DO_TEST_PLATFORM(pool, ...) \ + DO_TEST_FULL(false, pool, platform) =20 if (storageRegisterAll() < 0) return EXIT_FAILURE; @@ -165,31 +169,15 @@ mymain(void) DO_TEST_FAIL("pool-disk-device-nopartsep"); DO_TEST_FAIL("pool-iscsi"); DO_TEST_FAIL("pool-iscsi-auth"); -#ifdef __linux__ - DO_TEST_LINUX("pool-fs"); - DO_TEST_LINUX("pool-netfs"); - DO_TEST_LINUX("pool-netfs-auto"); - DO_TEST_LINUX("pool-netfs-protocol-ver"); - DO_TEST_LINUX("pool-netfs-ns-mountopts"); - DO_TEST_LINUX("pool-netfs-gluster"); - DO_TEST_LINUX("pool-netfs-cifs"); -#elif defined(__FreeBSD__) - DO_TEST_FREEBSD("pool-fs"); - DO_TEST_FREEBSD("pool-netfs"); - DO_TEST_FREEBSD("pool-netfs-auto"); - DO_TEST_FREEBSD("pool-netfs-protocol-ver"); - DO_TEST_FREEBSD("pool-netfs-ns-mountopts"); - DO_TEST_FREEBSD("pool-netfs-gluster"); - DO_TEST_FREEBSD("pool-netfs-cifs"); -#else - DO_TEST("pool-fs"); - DO_TEST("pool-netfs"); - DO_TEST("pool-netfs-auto"); - DO_TEST("pool-netfs-protocol-ver"); - DO_TEST("pool-netfs-ns-mountopts"); - DO_TEST("pool-netfs-gluster"); - DO_TEST("pool-netfs-cifs"); -#endif + + DO_TEST_PLATFORM("pool-fs"); + DO_TEST_PLATFORM("pool-netfs"); + DO_TEST_PLATFORM("pool-netfs-auto"); + DO_TEST_PLATFORM("pool-netfs-protocol-ver"); + DO_TEST_PLATFORM("pool-netfs-ns-mountopts"); + DO_TEST_PLATFORM("pool-netfs-gluster"); + DO_TEST_PLATFORM("pool-netfs-cifs"); + DO_TEST_FAIL("pool-scsi"); DO_TEST_FAIL("pool-scsi-type-scsi-host"); DO_TEST_FAIL("pool-scsi-type-fc-host"); --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 22:16:55 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 1548946542229361.490832923805; Thu, 31 Jan 2019 06:55:42 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 22FC913D10; Thu, 31 Jan 2019 14:55:23 +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 9B5583DBF; Thu, 31 Jan 2019 14:55:22 +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 240DE3F603; Thu, 31 Jan 2019 14:55:22 +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 x0VEstRI030889 for ; Thu, 31 Jan 2019 09:54:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id B186B62675; Thu, 31 Jan 2019 14:54:55 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 368E11710F for ; Thu, 31 Jan 2019 14:54:55 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 31 Jan 2019 15:54:47 +0100 Message-Id: <06186e6d8ccbc2cc1a4f40a4e13726c1e595b81a.1548946468.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] storagepoolxml2argvtest: run mountopts test conditionally 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-Type: text/plain; charset="utf-8" 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 31 Jan 2019 14:55:25 +0000 (UTC) This test relies on namespace support, which is only compiled in if we have the 'fs' and 'netfs' backends. Signed-off-by: J=C3=A1n Tomko --- tests/storagepoolxml2argvtest.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtes= t.c index 0b2c2e4f98..e7f42dc0f8 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -174,7 +174,9 @@ mymain(void) DO_TEST_PLATFORM("pool-netfs"); DO_TEST_PLATFORM("pool-netfs-auto"); DO_TEST_PLATFORM("pool-netfs-protocol-ver"); +#if WITH_STORAGE_FS DO_TEST_PLATFORM("pool-netfs-ns-mountopts"); +#endif DO_TEST_PLATFORM("pool-netfs-gluster"); DO_TEST_PLATFORM("pool-netfs-cifs"); =20 --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list