[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] tests/qapi-schema: Cover forward reference to su
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 6/7] tests/qapi-schema: Cover forward reference to sub-module |
Date: |
Tue, 5 Mar 2019 17:52:35 +0100 |
The forward reference from the main module to the sub-module works
fine, except for an issue visible in qapi-schema-test.out: the array
type wrapped around the forward reference ends up in the main module,
not the sub-module. The next commit will explain why that's bad, and
fix it.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/qapi-schema/qapi-schema-test.json | 3 ++-
tests/qapi-schema/qapi-schema-test.out | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index 908f718027..0952c68734 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -128,7 +128,8 @@
'boolean': ['bool'],
'string': ['str'],
'sizes': ['size'],
- 'any': ['any'] } }
+ 'any': ['any'],
+ 'user': ['Status'] } } # intentional forward ref. to sub-module
# for testing sub-modules
{ 'include': 'include/sub-module.json' }
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index cecf270ec3..38c1de70d8 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -144,6 +144,9 @@ object q_obj_sizeList-wrapper
member data: sizeList optional=False
object q_obj_anyList-wrapper
member data: anyList optional=False
+array StatusList Status
+object q_obj_StatusList-wrapper
+ member data: StatusList optional=False
enum UserDefListUnionKind
member integer
member s8
@@ -159,6 +162,7 @@ enum UserDefListUnionKind
member string
member sizes
member any
+ member user
object UserDefListUnion
member type: UserDefListUnionKind optional=False
tag type
@@ -176,6 +180,7 @@ object UserDefListUnion
case string: q_obj_strList-wrapper
case sizes: q_obj_sizeList-wrapper
case any: q_obj_anyList-wrapper
+ case user: q_obj_StatusList-wrapper
include include/sub-module.json
module include/sub-module.json
include sub-sub-module.json
--
2.17.2
- [Qemu-devel] [PULL 0/7] QAPI patches for 2019-03-05, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 1/7] tests/qapi-schema: Make test-qapi.py print arrays, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 6/7] tests/qapi-schema: Cover forward reference to sub-module,
Markus Armbruster <=
- [Qemu-devel] [PULL 3/7] qapi: Pass file name to QAPIGen constructor instead of methods, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 2/7] tests/qapi-schema: Cover conditional arrays, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 7/7] qapi: Fix array first used in a different module, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 4/7] qapi: Fix code generation for sub-modules in other directories, Markus Armbruster, 2019/03/05
- [Qemu-devel] [PULL 5/7] tests: Rename UserDefNativeListUnion to UserDefListUnion, Markus Armbruster, 2019/03/05
- Re: [Qemu-devel] [PULL 0/7] QAPI patches for 2019-03-05, Peter Maydell, 2019/03/05