From nobody Mon Feb 9 23:01:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1632749228; cv=none; d=zohomail.com; s=zohoarc; b=iH0ktkPQQfw1RElXlZ+fy2BUvLDkTtN7PilnxmVx1gk4AL0N1vOqvvSmAJuFlP+HNdI0E3mo3BKUujOtEj0IpG+GTZsvTP+m+WudqK/6NnyOyavYF0igixQvzD3JkjPILKaTO/GnSdnENF++Ty5t1CRSJQvD6jnxocMoQ3K6IJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632749228; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ups1L4r4vr298+cwSmkUAYzRSDFIKAmpPsWktfvFTj8=; b=blZiB8sYIkOdBufv19HAehvZuWI4WpsnNjLwOhaA6mubeP92rK5IV6UermH4WwTcurTDijma13vH+smDjH7Ip+SQ6IeWF2yw7ApdwlXGtBO5trttGD4HsT+GOoHBdrgdxiVhm9/FPZ0Kz+G14nmARxqHQ57311LnfiMKDqI2zn8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1632749228009121.22513618981316; Mon, 27 Sep 2021 06:27:08 -0700 (PDT) Received: from localhost ([::1]:60802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUqew-0007et-WB for importer@patchew.org; Mon, 27 Sep 2021 09:27:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUqLT-0003FY-U0 for qemu-devel@nongnu.org; Mon, 27 Sep 2021 09:07:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49540) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUqLP-0003jE-OL for qemu-devel@nongnu.org; Mon, 27 Sep 2021 09:06:57 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-530-VR3_gVWGN1-ztLOtBGFt-Q-1; Mon, 27 Sep 2021 09:06:53 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4ED9F100C666; Mon, 27 Sep 2021 13:06:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-14.ams2.redhat.com [10.36.112.14]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 22F385C261; Mon, 27 Sep 2021 13:06:52 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B48B911380BC; Mon, 27 Sep 2021 15:06:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632748014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ups1L4r4vr298+cwSmkUAYzRSDFIKAmpPsWktfvFTj8=; b=Ab93lBOWG0i1v8y3i12Ck1Deu2zRzScLRxJnoTos3flR9wdDlNtx7H2BGGtpkO4TLMiHjD C115vKkvNcEH8nspt169Fh7+46v4zKuH1vBvNvqHQRFLZg5wlPBebVzDzHRJMJD43YmjP0 TRry8NhGLXuPb4HoQka/0hpPow6ikT4= X-MC-Unique: VR3_gVWGN1-ztLOtBGFt-Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 18/25] test-clone-visitor: Wean off __org.qemu_x-Union1 Date: Mon, 27 Sep 2021 15:06:40 +0200 Message-Id: <20210927130647.1271533-19-armbru@redhat.com> In-Reply-To: <20210927130647.1271533-1-armbru@redhat.com> References: <20210927130647.1271533-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Eric Blake Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632749231139100001 Content-Type: text/plain; charset="utf-8" test_clone_complex3() uses simple union __org.qemu_x-Union1 to cover arrays. Use UserDefOneList instead. Unions are still covered by test_clone_complex1(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20210917143134.412106-19-armbru@redhat.com> --- tests/unit/test-clone-visitor.c | 70 ++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/tests/unit/test-clone-visitor.c b/tests/unit/test-clone-visito= r.c index 8357a90e60..4048018607 100644 --- a/tests/unit/test-clone-visitor.c +++ b/tests/unit/test-clone-visitor.c @@ -153,42 +153,48 @@ static void test_clone_complex2(void) =20 static void test_clone_complex3(void) { - __org_qemu_x_Struct2 *src, *dst; - __org_qemu_x_Union1List *tmp; + UserDefOneList *src, *dst, *tail; + UserDefOne *elt; =20 - src =3D g_new0(__org_qemu_x_Struct2, 1); - tmp =3D src->array =3D g_new0(__org_qemu_x_Union1List, 1); - tmp->value =3D g_new0(__org_qemu_x_Union1, 1); - tmp->value->type =3D ORG_QEMU_X_UNION1_KIND___ORG_QEMU_X_BRANCH; - tmp->value->u.__org_qemu_x_branch.data =3D g_strdup("one"); - tmp =3D tmp->next =3D g_new0(__org_qemu_x_Union1List, 1); - tmp->value =3D g_new0(__org_qemu_x_Union1, 1); - tmp->value->type =3D ORG_QEMU_X_UNION1_KIND___ORG_QEMU_X_BRANCH; - tmp->value->u.__org_qemu_x_branch.data =3D g_strdup("two"); - tmp =3D tmp->next =3D g_new0(__org_qemu_x_Union1List, 1); - tmp->value =3D g_new0(__org_qemu_x_Union1, 1); - tmp->value->type =3D ORG_QEMU_X_UNION1_KIND___ORG_QEMU_X_BRANCH; - tmp->value->u.__org_qemu_x_branch.data =3D g_strdup("three"); + src =3D NULL; + elt =3D g_new0(UserDefOne, 1); + elt->integer =3D 3; + elt->string =3D g_strdup("three"); + elt->has_enum1 =3D true; + elt->enum1 =3D ENUM_ONE_VALUE3; + QAPI_LIST_PREPEND(src, elt); + elt =3D g_new0(UserDefOne, 1); + elt->integer =3D 2; + elt->string =3D g_strdup("two"); + QAPI_LIST_PREPEND(src, elt); + elt =3D g_new0(UserDefOne, 1); + elt->integer =3D 1; + elt->string =3D g_strdup("one"); + QAPI_LIST_PREPEND(src, elt); + + dst =3D QAPI_CLONE(UserDefOneList, src); =20 - dst =3D QAPI_CLONE(__org_qemu_x_Struct2, src); g_assert(dst); - tmp =3D dst->array; - g_assert(tmp); - g_assert(tmp->value); - g_assert_cmpstr(tmp->value->u.__org_qemu_x_branch.data, =3D=3D, "one"); - tmp =3D tmp->next; - g_assert(tmp); - g_assert(tmp->value); - g_assert_cmpstr(tmp->value->u.__org_qemu_x_branch.data, =3D=3D, "two"); - tmp =3D tmp->next; - g_assert(tmp); - g_assert(tmp->value); - g_assert_cmpstr(tmp->value->u.__org_qemu_x_branch.data, =3D=3D, "three= "); - tmp =3D tmp->next; - g_assert(!tmp); + tail =3D dst; + elt =3D tail->value; + g_assert_cmpint(elt->integer, =3D=3D, 1); + g_assert_cmpstr(elt->string, =3D=3D, "one"); + g_assert(!elt->has_enum1); + tail =3D tail->next; + elt =3D tail->value; + g_assert_cmpint(elt->integer, =3D=3D, 2); + g_assert_cmpstr(elt->string, =3D=3D, "two"); + g_assert(!elt->has_enum1); + tail =3D tail->next; + elt =3D tail->value; + g_assert_cmpint(elt->integer, =3D=3D, 3); + g_assert_cmpstr(elt->string, =3D=3D, "three"); + g_assert(elt->has_enum1); + g_assert_cmpint(elt->enum1, =3D=3D, ENUM_ONE_VALUE3); + g_assert(!tail->next); =20 - qapi_free___org_qemu_x_Struct2(src); - qapi_free___org_qemu_x_Struct2(dst); + qapi_free_UserDefOneList(src); + qapi_free_UserDefOneList(dst); } =20 int main(int argc, char **argv) --=20 2.31.1