From nobody Mon Feb 9 16:44:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631889861999834.0818862197559; Fri, 17 Sep 2021 07:44:21 -0700 (PDT) Received: from localhost ([::1]:33456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRF6B-0004Oa-Ay for importer@patchew.org; Fri, 17 Sep 2021 10:44:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mREuE-0004Uq-PD for qemu-devel@nongnu.org; Fri, 17 Sep 2021 10:31:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:38932) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mREu4-0000M1-2g for qemu-devel@nongnu.org; Fri, 17 Sep 2021 10:31:58 -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-588-Wq3ZXZoZMUOdpqT1J0maqw-1; Fri, 17 Sep 2021 10:31:42 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2914BBBEE3; Fri, 17 Sep 2021 14:31:41 +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 7D89A5D6B1; Fri, 17 Sep 2021 14:31:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A3E4A1136421; Fri, 17 Sep 2021 16:31:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631889107; 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=ygn7Y7VoG+emw8JA44ASX8xo5BGuKGCFnCs5ZQWj+UI=; b=QFiEdAyzTkc6PX9qoViOD71HMLKlxZQhtgSZT9QMPwaU00UxII6ZmrWYnyaVXscoACgzZ5 DfHkyIH/HLFWJI4Sz2CWp4IDHns5YjLRr7WdDdiL1T0Cb8Y1/MAn/QuZIr7hXmOknacv9E rZ7dVeHsHSd18FOIOzuMF4gXsDGq/Jw= X-MC-Unique: Wq3ZXZoZMUOdpqT1J0maqw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 22/23] tests/qapi-schema: Rename flat-union-* test cases to union-* Date: Fri, 17 Sep 2021 16:31:33 +0200 Message-Id: <20210917143134.412106-23-armbru@redhat.com> In-Reply-To: <20210917143134.412106-1-armbru@redhat.com> References: <20210917143134.412106-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.392, 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: jsnow@redhat.com, michael.roth@amd.com, eblake@redhat.com, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631889864012100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake union-array-branch.json} | 0 ...rray-branch.out =3D> union-array-branch.out} | 0 tests/qapi-schema/union-bad-base.err | 2 ++ ...nion-bad-base.json =3D> union-bad-base.json} | 0 ...-union-bad-base.out =3D> union-bad-base.out} | 0 tests/qapi-schema/union-bad-discriminator.err | 2 ++ ...ator.json =3D> union-bad-discriminator.json} | 0 ...inator.out =3D> union-bad-discriminator.out} | 0 tests/qapi-schema/union-base-any.err | 2 ++ ...nion-base-any.json =3D> union-base-any.json} | 0 ...-union-base-any.out =3D> union-base-any.out} | 0 tests/qapi-schema/union-base-union.err | 2 ++ ...-base-union.json =3D> union-base-union.json} | 0 ...on-base-union.out =3D> union-base-union.out} | 0 tests/qapi-schema/union-clash-member.err | 2 ++ ...sh-member.json =3D> union-clash-member.json} | 0 ...lash-member.out =3D> union-clash-member.out} | 0 .../union-discriminator-bad-name.err | 2 ++ ...json =3D> union-discriminator-bad-name.json} | 0 ...e.out =3D> union-discriminator-bad-name.out} | 0 tests/qapi-schema/union-empty.err | 2 ++ ...flat-union-empty.json =3D> union-empty.json} | 0 .../{flat-union-empty.out =3D> union-empty.out} | 0 .../qapi-schema/union-inline-invalid-dict.err | 2 ++ ...ct.json =3D> union-inline-invalid-dict.json} | 0 ...dict.out =3D> union-inline-invalid-dict.out} | 0 tests/qapi-schema/union-int-branch.err | 2 ++ ...-int-branch.json =3D> union-int-branch.json} | 0 ...on-int-branch.out =3D> union-int-branch.out} | 0 .../qapi-schema/union-invalid-branch-key.err | 2 ++ ...key.json =3D> union-invalid-branch-key.json} | 0 ...h-key.out =3D> union-invalid-branch-key.out} | 0 .../union-invalid-discriminator.err | 2 ++ ....json =3D> union-invalid-discriminator.json} | 0 ...or.out =3D> union-invalid-discriminator.out} | 0 .../union-invalid-if-discriminator.err | 2 ++ ...on =3D> union-invalid-if-discriminator.json} | 0 ...out =3D> union-invalid-if-discriminator.out} | 0 tests/qapi-schema/union-no-base.err | 2 ++ ...-union-no-base.json =3D> union-no-base.json} | 0 ...at-union-no-base.out =3D> union-no-base.out} | 0 .../union-optional-discriminator.err | 2 ++ ...json =3D> union-optional-discriminator.json} | 0 ...r.out =3D> union-optional-discriminator.out} | 0 .../union-string-discriminator.err | 2 ++ ...r.json =3D> union-string-discriminator.json} | 0 ...tor.out =3D> union-string-discriminator.out} | 0 65 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 tests/qapi-schema/flat-union-array-branch.err delete mode 100644 tests/qapi-schema/flat-union-bad-base.err delete mode 100644 tests/qapi-schema/flat-union-bad-discriminator.err delete mode 100644 tests/qapi-schema/flat-union-base-any.err delete mode 100644 tests/qapi-schema/flat-union-base-union.err delete mode 100644 tests/qapi-schema/flat-union-clash-member.err delete mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.err delete mode 100644 tests/qapi-schema/flat-union-empty.err delete mode 100644 tests/qapi-schema/flat-union-inline-invalid-dict.err delete mode 100644 tests/qapi-schema/flat-union-int-branch.err delete mode 100644 tests/qapi-schema/flat-union-invalid-branch-key.err delete mode 100644 tests/qapi-schema/flat-union-invalid-discriminator.err delete mode 100644 tests/qapi-schema/flat-union-invalid-if-discriminator.e= rr delete mode 100644 tests/qapi-schema/flat-union-no-base.err delete mode 100644 tests/qapi-schema/flat-union-optional-discriminator.err delete mode 100644 tests/qapi-schema/flat-union-string-discriminator.err create mode 100644 tests/qapi-schema/union-array-branch.err rename tests/qapi-schema/{flat-union-array-branch.json =3D> union-array-br= anch.json} (100%) rename tests/qapi-schema/{flat-union-array-branch.out =3D> union-array-bra= nch.out} (100%) create mode 100644 tests/qapi-schema/union-bad-base.err rename tests/qapi-schema/{flat-union-bad-base.json =3D> union-bad-base.jso= n} (100%) rename tests/qapi-schema/{flat-union-bad-base.out =3D> union-bad-base.out}= (100%) create mode 100644 tests/qapi-schema/union-bad-discriminator.err rename tests/qapi-schema/{flat-union-bad-discriminator.json =3D> union-bad= -discriminator.json} (100%) rename tests/qapi-schema/{flat-union-bad-discriminator.out =3D> union-bad-= discriminator.out} (100%) create mode 100644 tests/qapi-schema/union-base-any.err rename tests/qapi-schema/{flat-union-base-any.json =3D> union-base-any.jso= n} (100%) rename tests/qapi-schema/{flat-union-base-any.out =3D> union-base-any.out}= (100%) create mode 100644 tests/qapi-schema/union-base-union.err rename tests/qapi-schema/{flat-union-base-union.json =3D> union-base-union= .json} (100%) rename tests/qapi-schema/{flat-union-base-union.out =3D> union-base-union.= out} (100%) create mode 100644 tests/qapi-schema/union-clash-member.err rename tests/qapi-schema/{flat-union-clash-member.json =3D> union-clash-me= mber.json} (100%) rename tests/qapi-schema/{flat-union-clash-member.out =3D> union-clash-mem= ber.out} (100%) create mode 100644 tests/qapi-schema/union-discriminator-bad-name.err rename tests/qapi-schema/{flat-union-discriminator-bad-name.json =3D> unio= n-discriminator-bad-name.json} (100%) rename tests/qapi-schema/{flat-union-discriminator-bad-name.out =3D> union= -discriminator-bad-name.out} (100%) create mode 100644 tests/qapi-schema/union-empty.err rename tests/qapi-schema/{flat-union-empty.json =3D> union-empty.json} (10= 0%) rename tests/qapi-schema/{flat-union-empty.out =3D> union-empty.out} (100%) create mode 100644 tests/qapi-schema/union-inline-invalid-dict.err rename tests/qapi-schema/{flat-union-inline-invalid-dict.json =3D> union-i= nline-invalid-dict.json} (100%) rename tests/qapi-schema/{flat-union-inline-invalid-dict.out =3D> union-in= line-invalid-dict.out} (100%) create mode 100644 tests/qapi-schema/union-int-branch.err rename tests/qapi-schema/{flat-union-int-branch.json =3D> union-int-branch= .json} (100%) rename tests/qapi-schema/{flat-union-int-branch.out =3D> union-int-branch.= out} (100%) create mode 100644 tests/qapi-schema/union-invalid-branch-key.err rename tests/qapi-schema/{flat-union-invalid-branch-key.json =3D> union-in= valid-branch-key.json} (100%) rename tests/qapi-schema/{flat-union-invalid-branch-key.out =3D> union-inv= alid-branch-key.out} (100%) create mode 100644 tests/qapi-schema/union-invalid-discriminator.err rename tests/qapi-schema/{flat-union-invalid-discriminator.json =3D> union= -invalid-discriminator.json} (100%) rename tests/qapi-schema/{flat-union-invalid-discriminator.out =3D> union-= invalid-discriminator.out} (100%) create mode 100644 tests/qapi-schema/union-invalid-if-discriminator.err rename tests/qapi-schema/{flat-union-invalid-if-discriminator.json =3D> un= ion-invalid-if-discriminator.json} (100%) rename tests/qapi-schema/{flat-union-invalid-if-discriminator.out =3D> uni= on-invalid-if-discriminator.out} (100%) create mode 100644 tests/qapi-schema/union-no-base.err rename tests/qapi-schema/{flat-union-no-base.json =3D> union-no-base.json}= (100%) rename tests/qapi-schema/{flat-union-no-base.out =3D> union-no-base.out} (= 100%) create mode 100644 tests/qapi-schema/union-optional-discriminator.err rename tests/qapi-schema/{flat-union-optional-discriminator.json =3D> unio= n-optional-discriminator.json} (100%) rename tests/qapi-schema/{flat-union-optional-discriminator.out =3D> union= -optional-discriminator.out} (100%) create mode 100644 tests/qapi-schema/union-string-discriminator.err rename tests/qapi-schema/{flat-union-string-discriminator.json =3D> union-= string-discriminator.json} (100%) rename tests/qapi-schema/{flat-union-string-discriminator.out =3D> union-s= tring-discriminator.out} (100%) diff --git a/tests/qapi-schema/flat-union-array-branch.err b/tests/qapi-sch= ema/flat-union-array-branch.err deleted file mode 100644 index 20a8ef1406..0000000000 --- a/tests/qapi-schema/flat-union-array-branch.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-array-branch.json: In union 'TestUnion': -flat-union-array-branch.json:8: 'data' member 'value1' cannot be an array diff --git a/tests/qapi-schema/flat-union-bad-base.err b/tests/qapi-schema/= flat-union-bad-base.err deleted file mode 100644 index e0a205a58c..0000000000 --- a/tests/qapi-schema/flat-union-bad-base.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-bad-base.json: In union 'TestUnion': -flat-union-bad-base.json:8: member 'string' of type 'TestTypeA' collides w= ith base member 'string' diff --git a/tests/qapi-schema/flat-union-bad-discriminator.err b/tests/qap= i-schema/flat-union-bad-discriminator.err deleted file mode 100644 index b705439bd9..0000000000 --- a/tests/qapi-schema/flat-union-bad-discriminator.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-bad-discriminator.json: In union 'TestUnion': -flat-union-bad-discriminator.json:11: 'discriminator' requires a string na= me diff --git a/tests/qapi-schema/flat-union-base-any.err b/tests/qapi-schema/= flat-union-base-any.err deleted file mode 100644 index c2d4de6a5d..0000000000 --- a/tests/qapi-schema/flat-union-base-any.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-base-any.json: In union 'TestUnion': -flat-union-base-any.json:8: 'base' requires a struct type, built-in type '= any' isn't diff --git a/tests/qapi-schema/flat-union-base-union.err b/tests/qapi-schem= a/flat-union-base-union.err deleted file mode 100644 index 3563e8777e..0000000000 --- a/tests/qapi-schema/flat-union-base-union.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-base-union.json: In union 'TestUnion': -flat-union-base-union.json:17: 'base' requires a struct type, union type '= UnionBase' isn't diff --git a/tests/qapi-schema/flat-union-clash-member.err b/tests/qapi-sch= ema/flat-union-clash-member.err deleted file mode 100644 index 07551e6ef5..0000000000 --- a/tests/qapi-schema/flat-union-clash-member.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-clash-member.json: In union 'TestUnion': -flat-union-clash-member.json:11: member 'name' of type 'Branch1' collides = with member 'name' of type 'Base' diff --git a/tests/qapi-schema/flat-union-discriminator-bad-name.err b/test= s/qapi-schema/flat-union-discriminator-bad-name.err deleted file mode 100644 index 28be49c31a..0000000000 --- a/tests/qapi-schema/flat-union-discriminator-bad-name.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-discriminator-bad-name.json: In union 'MyUnion': -flat-union-discriminator-bad-name.json:6: discriminator '*switch' is not a= member of 'base' diff --git a/tests/qapi-schema/flat-union-empty.err b/tests/qapi-schema/fla= t-union-empty.err deleted file mode 100644 index 89b0f25cb0..0000000000 --- a/tests/qapi-schema/flat-union-empty.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-empty.json: In union 'Union': -flat-union-empty.json:4: union has no branches diff --git a/tests/qapi-schema/flat-union-inline-invalid-dict.err b/tests/q= api-schema/flat-union-inline-invalid-dict.err deleted file mode 100644 index 53e5416707..0000000000 --- a/tests/qapi-schema/flat-union-inline-invalid-dict.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-inline-invalid-dict.json: In union 'TestUnion': -flat-union-inline-invalid-dict.json:7: 'data' member 'value1' misses key '= type' diff --git a/tests/qapi-schema/flat-union-int-branch.err b/tests/qapi-schem= a/flat-union-int-branch.err deleted file mode 100644 index ae7f800603..0000000000 --- a/tests/qapi-schema/flat-union-int-branch.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-int-branch.json: In union 'TestUnion': -flat-union-int-branch.json:8: branch 'value1' cannot use built-in type 'in= t' diff --git a/tests/qapi-schema/flat-union-invalid-branch-key.err b/tests/qa= pi-schema/flat-union-invalid-branch-key.err deleted file mode 100644 index 5576a25f9b..0000000000 --- a/tests/qapi-schema/flat-union-invalid-branch-key.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-invalid-branch-key.json: In union 'TestUnion': -flat-union-invalid-branch-key.json:13: branch 'value_wrong' is not a value= of enum type 'TestEnum' diff --git a/tests/qapi-schema/flat-union-invalid-discriminator.err b/tests= /qapi-schema/flat-union-invalid-discriminator.err deleted file mode 100644 index 99bca2ddab..0000000000 --- a/tests/qapi-schema/flat-union-invalid-discriminator.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-invalid-discriminator.json: In union 'TestUnion': -flat-union-invalid-discriminator.json:10: discriminator 'enum_wrong' is no= t a member of 'base' diff --git a/tests/qapi-schema/flat-union-invalid-if-discriminator.err b/te= sts/qapi-schema/flat-union-invalid-if-discriminator.err deleted file mode 100644 index 350f28da9d..0000000000 --- a/tests/qapi-schema/flat-union-invalid-if-discriminator.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-invalid-if-discriminator.json: In union 'TestUnion': -flat-union-invalid-if-discriminator.json:10: discriminator member 'enum1' = of 'base' must not be conditional diff --git a/tests/qapi-schema/flat-union-no-base.err b/tests/qapi-schema/f= lat-union-no-base.err deleted file mode 100644 index c60482f96b..0000000000 --- a/tests/qapi-schema/flat-union-no-base.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-no-base.json: In union 'TestUnion': -flat-union-no-base.json:8: union misses key 'base' diff --git a/tests/qapi-schema/flat-union-optional-discriminator.err b/test= s/qapi-schema/flat-union-optional-discriminator.err deleted file mode 100644 index 3d60a1b496..0000000000 --- a/tests/qapi-schema/flat-union-optional-discriminator.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-optional-discriminator.json: In union 'MyUnion': -flat-union-optional-discriminator.json:6: discriminator member 'switch' of= base type 'Base' must not be optional diff --git a/tests/qapi-schema/flat-union-string-discriminator.err b/tests/= qapi-schema/flat-union-string-discriminator.err deleted file mode 100644 index ff42c9728b..0000000000 --- a/tests/qapi-schema/flat-union-string-discriminator.err +++ /dev/null @@ -1,2 +0,0 @@ -flat-union-string-discriminator.json: In union 'TestUnion': -flat-union-string-discriminator.json:13: discriminator member 'kind' of ba= se type 'TestBase' must be of enum type diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 85d3de1481..6187efbd58 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -107,22 +107,6 @@ schemas =3D [ 'features-name-bad-type.json', 'features-no-list.json', 'features-unknown-key.json', - 'flat-union-array-branch.json', - 'flat-union-bad-base.json', - 'flat-union-bad-discriminator.json', - 'flat-union-base-any.json', - 'flat-union-base-union.json', - 'flat-union-clash-member.json', - 'flat-union-discriminator-bad-name.json', - 'flat-union-empty.json', - 'flat-union-inline-invalid-dict.json', - 'flat-union-int-branch.json', - 'flat-union-invalid-branch-key.json', - 'flat-union-invalid-discriminator.json', - 'flat-union-invalid-if-discriminator.json', - 'flat-union-no-base.json', - 'flat-union-optional-discriminator.json', - 'flat-union-string-discriminator.json', 'funny-char.json', 'funny-word.json', 'ident-with-escape.json', @@ -190,12 +174,28 @@ schemas =3D [ 'unclosed-list.json', 'unclosed-object.json', 'unclosed-string.json', + 'union-array-branch.json', + 'union-bad-base.json', + 'union-bad-discriminator.json', + 'union-base-any.json', 'union-base-empty.json', 'union-base-no-discriminator.json', + 'union-base-union.json', 'union-branch-if-invalid.json', 'union-branch-invalid-dict.json', + 'union-clash-member.json', + 'union-discriminator-bad-name.json', + 'union-empty.json', + 'union-inline-invalid-dict.json', + 'union-int-branch.json', 'union-invalid-base.json', + 'union-invalid-branch-key.json', 'union-invalid-data.json', + 'union-invalid-discriminator.json', + 'union-invalid-if-discriminator.json', + 'union-no-base.json', + 'union-optional-discriminator.json', + 'union-string-discriminator.json', 'union-unknown.json', 'unknown-escape.json', 'unknown-expr-key.json', diff --git a/tests/qapi-schema/union-array-branch.err b/tests/qapi-schema/u= nion-array-branch.err new file mode 100644 index 0000000000..5db9c17481 --- /dev/null +++ b/tests/qapi-schema/union-array-branch.err @@ -0,0 +1,2 @@ +union-array-branch.json: In union 'TestUnion': +union-array-branch.json:8: 'data' member 'value1' cannot be an array diff --git a/tests/qapi-schema/flat-union-array-branch.json b/tests/qapi-sc= hema/union-array-branch.json similarity index 100% rename from tests/qapi-schema/flat-union-array-branch.json rename to tests/qapi-schema/union-array-branch.json diff --git a/tests/qapi-schema/flat-union-array-branch.out b/tests/qapi-sch= ema/union-array-branch.out similarity index 100% rename from tests/qapi-schema/flat-union-array-branch.out rename to tests/qapi-schema/union-array-branch.out diff --git a/tests/qapi-schema/union-bad-base.err b/tests/qapi-schema/union= -bad-base.err new file mode 100644 index 0000000000..42b2ed1dda --- /dev/null +++ b/tests/qapi-schema/union-bad-base.err @@ -0,0 +1,2 @@ +union-bad-base.json: In union 'TestUnion': +union-bad-base.json:8: member 'string' of type 'TestTypeA' collides with b= ase member 'string' diff --git a/tests/qapi-schema/flat-union-bad-base.json b/tests/qapi-schema= /union-bad-base.json similarity index 100% rename from tests/qapi-schema/flat-union-bad-base.json rename to tests/qapi-schema/union-bad-base.json diff --git a/tests/qapi-schema/flat-union-bad-base.out b/tests/qapi-schema/= union-bad-base.out similarity index 100% rename from tests/qapi-schema/flat-union-bad-base.out rename to tests/qapi-schema/union-bad-base.out diff --git a/tests/qapi-schema/union-bad-discriminator.err b/tests/qapi-sch= ema/union-bad-discriminator.err new file mode 100644 index 0000000000..7cfd470f58 --- /dev/null +++ b/tests/qapi-schema/union-bad-discriminator.err @@ -0,0 +1,2 @@ +union-bad-discriminator.json: In union 'TestUnion': +union-bad-discriminator.json:11: 'discriminator' requires a string name diff --git a/tests/qapi-schema/flat-union-bad-discriminator.json b/tests/qa= pi-schema/union-bad-discriminator.json similarity index 100% rename from tests/qapi-schema/flat-union-bad-discriminator.json rename to tests/qapi-schema/union-bad-discriminator.json diff --git a/tests/qapi-schema/flat-union-bad-discriminator.out b/tests/qap= i-schema/union-bad-discriminator.out similarity index 100% rename from tests/qapi-schema/flat-union-bad-discriminator.out rename to tests/qapi-schema/union-bad-discriminator.out diff --git a/tests/qapi-schema/union-base-any.err b/tests/qapi-schema/union= -base-any.err new file mode 100644 index 0000000000..82b48bc1c8 --- /dev/null +++ b/tests/qapi-schema/union-base-any.err @@ -0,0 +1,2 @@ +union-base-any.json: In union 'TestUnion': +union-base-any.json:8: 'base' requires a struct type, built-in type 'any' = isn't diff --git a/tests/qapi-schema/flat-union-base-any.json b/tests/qapi-schema= /union-base-any.json similarity index 100% rename from tests/qapi-schema/flat-union-base-any.json rename to tests/qapi-schema/union-base-any.json diff --git a/tests/qapi-schema/flat-union-base-any.out b/tests/qapi-schema/= union-base-any.out similarity index 100% rename from tests/qapi-schema/flat-union-base-any.out rename to tests/qapi-schema/union-base-any.out diff --git a/tests/qapi-schema/union-base-union.err b/tests/qapi-schema/uni= on-base-union.err new file mode 100644 index 0000000000..2bddaf6a84 --- /dev/null +++ b/tests/qapi-schema/union-base-union.err @@ -0,0 +1,2 @@ +union-base-union.json: In union 'TestUnion': +union-base-union.json:17: 'base' requires a struct type, union type 'Union= Base' isn't diff --git a/tests/qapi-schema/flat-union-base-union.json b/tests/qapi-sche= ma/union-base-union.json similarity index 100% rename from tests/qapi-schema/flat-union-base-union.json rename to tests/qapi-schema/union-base-union.json diff --git a/tests/qapi-schema/flat-union-base-union.out b/tests/qapi-schem= a/union-base-union.out similarity index 100% rename from tests/qapi-schema/flat-union-base-union.out rename to tests/qapi-schema/union-base-union.out diff --git a/tests/qapi-schema/union-clash-member.err b/tests/qapi-schema/u= nion-clash-member.err new file mode 100644 index 0000000000..c1f3a02552 --- /dev/null +++ b/tests/qapi-schema/union-clash-member.err @@ -0,0 +1,2 @@ +union-clash-member.json: In union 'TestUnion': +union-clash-member.json:11: member 'name' of type 'Branch1' collides with = member 'name' of type 'Base' diff --git a/tests/qapi-schema/flat-union-clash-member.json b/tests/qapi-sc= hema/union-clash-member.json similarity index 100% rename from tests/qapi-schema/flat-union-clash-member.json rename to tests/qapi-schema/union-clash-member.json diff --git a/tests/qapi-schema/flat-union-clash-member.out b/tests/qapi-sch= ema/union-clash-member.out similarity index 100% rename from tests/qapi-schema/flat-union-clash-member.out rename to tests/qapi-schema/union-clash-member.out diff --git a/tests/qapi-schema/union-discriminator-bad-name.err b/tests/qap= i-schema/union-discriminator-bad-name.err new file mode 100644 index 0000000000..5793e9af66 --- /dev/null +++ b/tests/qapi-schema/union-discriminator-bad-name.err @@ -0,0 +1,2 @@ +union-discriminator-bad-name.json: In union 'MyUnion': +union-discriminator-bad-name.json:6: discriminator '*switch' is not a memb= er of 'base' diff --git a/tests/qapi-schema/flat-union-discriminator-bad-name.json b/tes= ts/qapi-schema/union-discriminator-bad-name.json similarity index 100% rename from tests/qapi-schema/flat-union-discriminator-bad-name.json rename to tests/qapi-schema/union-discriminator-bad-name.json diff --git a/tests/qapi-schema/flat-union-discriminator-bad-name.out b/test= s/qapi-schema/union-discriminator-bad-name.out similarity index 100% rename from tests/qapi-schema/flat-union-discriminator-bad-name.out rename to tests/qapi-schema/union-discriminator-bad-name.out diff --git a/tests/qapi-schema/union-empty.err b/tests/qapi-schema/union-em= pty.err new file mode 100644 index 0000000000..d428439962 --- /dev/null +++ b/tests/qapi-schema/union-empty.err @@ -0,0 +1,2 @@ +union-empty.json: In union 'Union': +union-empty.json:4: union has no branches diff --git a/tests/qapi-schema/flat-union-empty.json b/tests/qapi-schema/un= ion-empty.json similarity index 100% rename from tests/qapi-schema/flat-union-empty.json rename to tests/qapi-schema/union-empty.json diff --git a/tests/qapi-schema/flat-union-empty.out b/tests/qapi-schema/uni= on-empty.out similarity index 100% rename from tests/qapi-schema/flat-union-empty.out rename to tests/qapi-schema/union-empty.out diff --git a/tests/qapi-schema/union-inline-invalid-dict.err b/tests/qapi-s= chema/union-inline-invalid-dict.err new file mode 100644 index 0000000000..25ddf7c765 --- /dev/null +++ b/tests/qapi-schema/union-inline-invalid-dict.err @@ -0,0 +1,2 @@ +union-inline-invalid-dict.json: In union 'TestUnion': +union-inline-invalid-dict.json:7: 'data' member 'value1' misses key 'type' diff --git a/tests/qapi-schema/flat-union-inline-invalid-dict.json b/tests/= qapi-schema/union-inline-invalid-dict.json similarity index 100% rename from tests/qapi-schema/flat-union-inline-invalid-dict.json rename to tests/qapi-schema/union-inline-invalid-dict.json diff --git a/tests/qapi-schema/flat-union-inline-invalid-dict.out b/tests/q= api-schema/union-inline-invalid-dict.out similarity index 100% rename from tests/qapi-schema/flat-union-inline-invalid-dict.out rename to tests/qapi-schema/union-inline-invalid-dict.out diff --git a/tests/qapi-schema/union-int-branch.err b/tests/qapi-schema/uni= on-int-branch.err new file mode 100644 index 0000000000..8fdc81edd1 --- /dev/null +++ b/tests/qapi-schema/union-int-branch.err @@ -0,0 +1,2 @@ +union-int-branch.json: In union 'TestUnion': +union-int-branch.json:8: branch 'value1' cannot use built-in type 'int' diff --git a/tests/qapi-schema/flat-union-int-branch.json b/tests/qapi-sche= ma/union-int-branch.json similarity index 100% rename from tests/qapi-schema/flat-union-int-branch.json rename to tests/qapi-schema/union-int-branch.json diff --git a/tests/qapi-schema/flat-union-int-branch.out b/tests/qapi-schem= a/union-int-branch.out similarity index 100% rename from tests/qapi-schema/flat-union-int-branch.out rename to tests/qapi-schema/union-int-branch.out diff --git a/tests/qapi-schema/union-invalid-branch-key.err b/tests/qapi-sc= hema/union-invalid-branch-key.err new file mode 100644 index 0000000000..bf58800507 --- /dev/null +++ b/tests/qapi-schema/union-invalid-branch-key.err @@ -0,0 +1,2 @@ +union-invalid-branch-key.json: In union 'TestUnion': +union-invalid-branch-key.json:13: branch 'value_wrong' is not a value of e= num type 'TestEnum' diff --git a/tests/qapi-schema/flat-union-invalid-branch-key.json b/tests/q= api-schema/union-invalid-branch-key.json similarity index 100% rename from tests/qapi-schema/flat-union-invalid-branch-key.json rename to tests/qapi-schema/union-invalid-branch-key.json diff --git a/tests/qapi-schema/flat-union-invalid-branch-key.out b/tests/qa= pi-schema/union-invalid-branch-key.out similarity index 100% rename from tests/qapi-schema/flat-union-invalid-branch-key.out rename to tests/qapi-schema/union-invalid-branch-key.out diff --git a/tests/qapi-schema/union-invalid-discriminator.err b/tests/qapi= -schema/union-invalid-discriminator.err new file mode 100644 index 0000000000..38efb24b98 --- /dev/null +++ b/tests/qapi-schema/union-invalid-discriminator.err @@ -0,0 +1,2 @@ +union-invalid-discriminator.json: In union 'TestUnion': +union-invalid-discriminator.json:10: discriminator 'enum_wrong' is not a m= ember of 'base' diff --git a/tests/qapi-schema/flat-union-invalid-discriminator.json b/test= s/qapi-schema/union-invalid-discriminator.json similarity index 100% rename from tests/qapi-schema/flat-union-invalid-discriminator.json rename to tests/qapi-schema/union-invalid-discriminator.json diff --git a/tests/qapi-schema/flat-union-invalid-discriminator.out b/tests= /qapi-schema/union-invalid-discriminator.out similarity index 100% rename from tests/qapi-schema/flat-union-invalid-discriminator.out rename to tests/qapi-schema/union-invalid-discriminator.out diff --git a/tests/qapi-schema/union-invalid-if-discriminator.err b/tests/q= api-schema/union-invalid-if-discriminator.err new file mode 100644 index 0000000000..3f41d03f8e --- /dev/null +++ b/tests/qapi-schema/union-invalid-if-discriminator.err @@ -0,0 +1,2 @@ +union-invalid-if-discriminator.json: In union 'TestUnion': +union-invalid-if-discriminator.json:10: discriminator member 'enum1' of 'b= ase' must not be conditional diff --git a/tests/qapi-schema/flat-union-invalid-if-discriminator.json b/t= ests/qapi-schema/union-invalid-if-discriminator.json similarity index 100% rename from tests/qapi-schema/flat-union-invalid-if-discriminator.json rename to tests/qapi-schema/union-invalid-if-discriminator.json diff --git a/tests/qapi-schema/flat-union-invalid-if-discriminator.out b/te= sts/qapi-schema/union-invalid-if-discriminator.out similarity index 100% rename from tests/qapi-schema/flat-union-invalid-if-discriminator.out rename to tests/qapi-schema/union-invalid-if-discriminator.out diff --git a/tests/qapi-schema/union-no-base.err b/tests/qapi-schema/union-= no-base.err new file mode 100644 index 0000000000..cbf12ac526 --- /dev/null +++ b/tests/qapi-schema/union-no-base.err @@ -0,0 +1,2 @@ +union-no-base.json: In union 'TestUnion': +union-no-base.json:8: union misses key 'base' diff --git a/tests/qapi-schema/flat-union-no-base.json b/tests/qapi-schema/= union-no-base.json similarity index 100% rename from tests/qapi-schema/flat-union-no-base.json rename to tests/qapi-schema/union-no-base.json diff --git a/tests/qapi-schema/flat-union-no-base.out b/tests/qapi-schema/u= nion-no-base.out similarity index 100% rename from tests/qapi-schema/flat-union-no-base.out rename to tests/qapi-schema/union-no-base.out diff --git a/tests/qapi-schema/union-optional-discriminator.err b/tests/qap= i-schema/union-optional-discriminator.err new file mode 100644 index 0000000000..8d980bd2ac --- /dev/null +++ b/tests/qapi-schema/union-optional-discriminator.err @@ -0,0 +1,2 @@ +union-optional-discriminator.json: In union 'MyUnion': +union-optional-discriminator.json:6: discriminator member 'switch' of base= type 'Base' must not be optional diff --git a/tests/qapi-schema/flat-union-optional-discriminator.json b/tes= ts/qapi-schema/union-optional-discriminator.json similarity index 100% rename from tests/qapi-schema/flat-union-optional-discriminator.json rename to tests/qapi-schema/union-optional-discriminator.json diff --git a/tests/qapi-schema/flat-union-optional-discriminator.out b/test= s/qapi-schema/union-optional-discriminator.out similarity index 100% rename from tests/qapi-schema/flat-union-optional-discriminator.out rename to tests/qapi-schema/union-optional-discriminator.out diff --git a/tests/qapi-schema/union-string-discriminator.err b/tests/qapi-= schema/union-string-discriminator.err new file mode 100644 index 0000000000..eccbe681bd --- /dev/null +++ b/tests/qapi-schema/union-string-discriminator.err @@ -0,0 +1,2 @@ +union-string-discriminator.json: In union 'TestUnion': +union-string-discriminator.json:13: discriminator member 'kind' of base ty= pe 'TestBase' must be of enum type diff --git a/tests/qapi-schema/flat-union-string-discriminator.json b/tests= /qapi-schema/union-string-discriminator.json similarity index 100% rename from tests/qapi-schema/flat-union-string-discriminator.json rename to tests/qapi-schema/union-string-discriminator.json diff --git a/tests/qapi-schema/flat-union-string-discriminator.out b/tests/= qapi-schema/union-string-discriminator.out similarity index 100% rename from tests/qapi-schema/flat-union-string-discriminator.out rename to tests/qapi-schema/union-string-discriminator.out --=20 2.31.1