[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] tests/qapi-schema: Cover conditional arrays
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 2/7] tests/qapi-schema: Cover conditional arrays |
Date: |
Fri, 1 Mar 2019 16:40:46 +0100 |
Commit 967c885108f neglected to cover arrays of conditional types. Do
that now.
Signed-off-by: Markus Armbruster <address@hidden>
---
tests/qapi-schema/qapi-schema-test.json | 2 +-
tests/qapi-schema/qapi-schema-test.out | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index cb0857df52..70612f394e 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -236,5 +236,5 @@
{ 'event': 'TestIfEvent', 'data':
{ 'foo': 'TestIfStruct',
- 'bar': { 'type': 'TestIfEnum', 'if': 'defined(TEST_IF_EVT_BAR)' } },
+ 'bar': { 'type': ['TestIfEnum'], 'if': 'defined(TEST_IF_EVT_BAR)' } },
'if': 'defined(TEST_IF_EVT) && defined(TEST_IF_STRUCT)' }
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index b59f4ca5a4..97f671ca5f 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -325,9 +325,11 @@ command TestIfCmd q_obj_TestIfCmd-arg -> UserDefThree
if ['defined(TEST_IF_CMD)', 'defined(TEST_IF_STRUCT)']
command TestCmdReturnDefThree None -> UserDefThree
gen=True success_response=True boxed=False oob=False preconfig=False
+array TestIfEnumList TestIfEnum
+ if ['defined(TEST_IF_ENUM)']
object q_obj_TestIfEvent-arg
member foo: TestIfStruct optional=False
- member bar: TestIfEnum optional=False
+ member bar: TestIfEnumList optional=False
if ['defined(TEST_IF_EVT_BAR)']
if ['defined(TEST_IF_EVT) && defined(TEST_IF_STRUCT)']
event TestIfEvent q_obj_TestIfEvent-arg
--
2.17.2
- Re: [Qemu-devel] [PATCH 6/7] tests/qapi-schema: Cover forward reference to sub-module, (continued)
- [Qemu-devel] [PATCH 7/7] qapi: Fix array first used in a different module, Markus Armbruster, 2019/03/01
- [Qemu-devel] [PATCH 4/7] qapi: Fix code generation for sub-modules in other directories, Markus Armbruster, 2019/03/01
- [Qemu-devel] [PATCH 3/7] qapi: Pass file name to QAPIGen constructor instead of methods, Markus Armbruster, 2019/03/01
- [Qemu-devel] [PATCH 5/7] tests: Rename UserDefNativeListUnion to UserDefListUnion, Markus Armbruster, 2019/03/01
- [Qemu-devel] [PATCH 2/7] tests/qapi-schema: Cover conditional arrays,
Markus Armbruster <=
- [Qemu-devel] [PATCH 1/7] tests/qapi-schema: Make test-qapi.py print arrays, Markus Armbruster, 2019/03/01