[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/17] tests/qapi-schema: Cover optional conditional struct member
From: |
Markus Armbruster |
Subject: |
[PULL 12/17] tests/qapi-schema: Cover optional conditional struct member |
Date: |
Wed, 26 Apr 2023 07:57:39 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-13-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
tests/qapi-schema/qapi-schema-test.json | 3 ++-
tests/qapi-schema/qapi-schema-test.out | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index 8f0ee95d23..f1f742d38c 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -220,7 +220,8 @@
{ 'struct': 'TestIfStruct',
'data': { 'foo': 'int',
- 'bar': { 'type': 'int', 'if': 'TEST_IF_STRUCT_MEMBER'} },
+ 'bar': { 'type': 'int', 'if': 'TEST_IF_STRUCT_MEMBER'},
+ '*baz': { 'type': 'str', 'if': 'TEST_IF_STRUCT_MEMBER'} },
'if': 'TEST_IF_STRUCT' }
{ 'enum': 'TestIfEnum',
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index 715f3a3f23..cee92c0d2e 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -247,6 +247,8 @@ object TestIfStruct
member foo: int optional=False
member bar: int optional=False
if TEST_IF_STRUCT_MEMBER
+ member baz: str optional=True
+ if TEST_IF_STRUCT_MEMBER
if TEST_IF_STRUCT
enum TestIfEnum
member foo
--
2.39.2
- [PULL 01/17] qapi: Fix error message format regression, (continued)
- [PULL 01/17] qapi: Fix error message format regression, Markus Armbruster, 2023/04/26
- [PULL 13/17] qapi: Fix code generated for optional conditional struct member, Markus Armbruster, 2023/04/26
- [PULL 16/17] qapi: Improve specificity of type/member descriptions, Markus Armbruster, 2023/04/26
- [PULL 14/17] qapi: Require boxed for conditional command and event arguments, Markus Armbruster, 2023/04/26
- [PULL 07/17] qapi: Fix error message when type name or array is expected, Markus Armbruster, 2023/04/26
- [PULL 11/17] tests/qapi-schema: Clean up positive test for conditionals, Markus Armbruster, 2023/04/26
- [PULL 06/17] qapi: Simplify code a bit after previous commits, Markus Armbruster, 2023/04/26
- [PULL 04/17] qapi: Split up check_type(), Markus Armbruster, 2023/04/26
- [PULL 15/17] qapi: support updating expected test output via make, Markus Armbruster, 2023/04/26
- [PULL 05/17] qapi: Improve error message for unexpected array types, Markus Armbruster, 2023/04/26
- [PULL 12/17] tests/qapi-schema: Cover optional conditional struct member,
Markus Armbruster <=
- [PULL 10/17] tests/qapi-schema: Rename a few conditionals, Markus Armbruster, 2023/04/26
- [PULL 09/17] tests/qapi-schema: Improve union discriminator coverage, Markus Armbruster, 2023/04/26
- [PULL 17/17] qapi: allow unions to contain further unions, Markus Armbruster, 2023/04/26
- Re: [PULL 00/17] QAPI patches patches for 2023-04-26, Richard Henderson, 2023/04/26