From nobody Sun Feb 8 14:35:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520449588020566.1835892387172; Wed, 7 Mar 2018 11:06:28 -0800 (PST) Received: from localhost ([::1]:35073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eteOM-0000WO-Ul for importer@patchew.org; Wed, 07 Mar 2018 14:06:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eteIZ-0004iL-Fe for qemu-devel@nongnu.org; Wed, 07 Mar 2018 14:00:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eteIY-0004X4-8A for qemu-devel@nongnu.org; Wed, 07 Mar 2018 14:00:23 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:58054 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eteIQ-0004Np-T4; Wed, 07 Mar 2018 14:00:14 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5095D4000787; Wed, 7 Mar 2018 19:00:14 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-216.ams2.redhat.com [10.36.116.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1626202322B; Wed, 7 Mar 2018 19:00:12 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Wed, 7 Mar 2018 19:59:19 +0100 Message-Id: <20180307185946.29366-11-kwolf@redhat.com> In-Reply-To: <20180307185946.29366-1-kwolf@redhat.com> References: <20180307185946.29366-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Wed, 07 Mar 2018 19:00:14 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Wed, 07 Mar 2018 19:00:14 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v4 10/37] test-qemu-opts: Test qemu_opts_append() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jdurgin@redhat.com, pkrempa@redhat.com, mitake.hitoshi@lab.ntt.co.jp, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, namei.unix@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Basic test for merging two QemuOptsLists. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Reviewed-by: Max Reitz --- tests/test-qemu-opts.c | 128 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 128 insertions(+) diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index 5d5a3daa7b..6c3183390b 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -23,6 +23,8 @@ static QemuOptsList opts_list_01 =3D { { .name =3D "str1", .type =3D QEMU_OPT_STRING, + .help =3D "Help texts are preserved in qemu_opts_append", + .def_value_str =3D "default", },{ .name =3D "str2", .type =3D QEMU_OPT_STRING, @@ -32,6 +34,7 @@ static QemuOptsList opts_list_01 =3D { },{ .name =3D "number1", .type =3D QEMU_OPT_NUMBER, + .help =3D "Having help texts only for some options is okay", },{ .name =3D "number2", .type =3D QEMU_OPT_NUMBER, @@ -743,6 +746,129 @@ static void test_opts_parse_size(void) qemu_opts_reset(&opts_list_02); } =20 +static void append_verify_list_01(QemuOptDesc *desc, bool with_overlapping) +{ + int i =3D 0; + + if (with_overlapping) { + g_assert_cmpstr(desc[i].name, =3D=3D, "str1"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_STRING); + g_assert_cmpstr(desc[i].help, =3D=3D, + "Help texts are preserved in qemu_opts_append"); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, "default"); + i++; + + g_assert_cmpstr(desc[i].name, =3D=3D, "str2"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_STRING); + g_assert_cmpstr(desc[i].help, =3D=3D, NULL); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, NULL); + i++; + } + + g_assert_cmpstr(desc[i].name, =3D=3D, "str3"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_STRING); + g_assert_cmpstr(desc[i].help, =3D=3D, NULL); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, NULL); + i++; + + g_assert_cmpstr(desc[i].name, =3D=3D, "number1"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_NUMBER); + g_assert_cmpstr(desc[i].help, =3D=3D, + "Having help texts only for some options is okay"); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, NULL); + i++; + + g_assert_cmpstr(desc[i].name, =3D=3D, "number2"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_NUMBER); + g_assert_cmpstr(desc[i].help, =3D=3D, NULL); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, NULL); + i++; + + g_assert_cmpstr(desc[i].name, =3D=3D, NULL); +} + +static void append_verify_list_02(QemuOptDesc *desc) +{ + int i =3D 0; + + g_assert_cmpstr(desc[i].name, =3D=3D, "str1"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_STRING); + g_assert_cmpstr(desc[i].help, =3D=3D, NULL); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, NULL); + i++; + + g_assert_cmpstr(desc[i].name, =3D=3D, "str2"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_STRING); + g_assert_cmpstr(desc[i].help, =3D=3D, NULL); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, NULL); + i++; + + g_assert_cmpstr(desc[i].name, =3D=3D, "bool1"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_BOOL); + g_assert_cmpstr(desc[i].help, =3D=3D, NULL); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, NULL); + i++; + + g_assert_cmpstr(desc[i].name, =3D=3D, "bool2"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_BOOL); + g_assert_cmpstr(desc[i].help, =3D=3D, NULL); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, NULL); + i++; + + g_assert_cmpstr(desc[i].name, =3D=3D, "size1"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_SIZE); + g_assert_cmpstr(desc[i].help, =3D=3D, NULL); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, NULL); + i++; + + g_assert_cmpstr(desc[i].name, =3D=3D, "size2"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_SIZE); + g_assert_cmpstr(desc[i].help, =3D=3D, NULL); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, NULL); + i++; + + g_assert_cmpstr(desc[i].name, =3D=3D, "size3"); + g_assert_cmpint(desc[i].type, =3D=3D, QEMU_OPT_SIZE); + g_assert_cmpstr(desc[i].help, =3D=3D, NULL); + g_assert_cmpstr(desc[i].def_value_str, =3D=3D, NULL); +} + +static void test_opts_append_to_null(void) +{ + QemuOptsList *merged; + + merged =3D qemu_opts_append(NULL, &opts_list_01); + g_assert(merged !=3D &opts_list_01); + + g_assert_cmpstr(merged->name, =3D=3D, NULL); + g_assert_cmpstr(merged->implied_opt_name, =3D=3D, NULL); + g_assert_false(merged->merge_lists); + + append_verify_list_01(merged->desc, true); + + qemu_opts_free(merged); +} + +static void test_opts_append(void) +{ + QemuOptsList *first, *merged; + + first =3D qemu_opts_append(NULL, &opts_list_02); + merged =3D qemu_opts_append(first, &opts_list_01); + g_assert(first !=3D &opts_list_02); + g_assert(merged !=3D &opts_list_01); + + g_assert_cmpstr(merged->name, =3D=3D, NULL); + g_assert_cmpstr(merged->implied_opt_name, =3D=3D, NULL); + g_assert_false(merged->merge_lists); + + append_verify_list_02(&merged->desc[0]); + append_verify_list_01(&merged->desc[7], false); + + qemu_opts_free(merged); +} + + int main(int argc, char *argv[]) { register_opts(); @@ -761,6 +887,8 @@ int main(int argc, char *argv[]) g_test_add_func("/qemu-opts/opts_parse/bool", test_opts_parse_bool); g_test_add_func("/qemu-opts/opts_parse/number", test_opts_parse_number= ); g_test_add_func("/qemu-opts/opts_parse/size", test_opts_parse_size); + g_test_add_func("/qemu-opts/append_to_null", test_opts_append_to_null); + g_test_add_func("/qemu-opts/append", test_opts_append); g_test_run(); return 0; } --=20 2.13.6