ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/qapi-schema: Cover forward reference to sub-module 

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 <armbru@redhat.com>
Message-Id: <20190301154051.23317-7-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2019-03-01 16:40:50 +01:00
parent b359f4b203
commit 5e12eb987b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/qapi-schema/qapi-schema-test.json
View File

@ -128,7 +128,8 @@
'boolean': ['bool'], 'boolean': ['bool'],
'string': ['str'], 'string': ['str'],
'sizes': ['size'], 'sizes': ['size'],
'any': ['any'] } } 'any': ['any'],
'user': ['Status'] } } # intentional forward ref. to sub-module
# for testing sub-modules # for testing sub-modules
{ 'include': 'include/sub-module.json' } { 'include': 'include/sub-module.json' }

5
tests/qapi-schema/qapi-schema-test.out
View File

@ -144,6 +144,9 @@ object q_obj_sizeList-wrapper
member data: sizeList optional=False member data: sizeList optional=False
object q_obj_anyList-wrapper object q_obj_anyList-wrapper
member data: anyList optional=False member data: anyList optional=False
array StatusList Status
object q_obj_StatusList-wrapper
member data: StatusList optional=False
enum UserDefListUnionKind enum UserDefListUnionKind
member integer member integer
member s8 member s8
@ -159,6 +162,7 @@ enum UserDefListUnionKind
member string member string
member sizes member sizes
member any member any
member user
object UserDefListUnion object UserDefListUnion
member type: UserDefListUnionKind optional=False member type: UserDefListUnionKind optional=False
tag type tag type
@ -176,6 +180,7 @@ object UserDefListUnion
case string: q_obj_strList-wrapper case string: q_obj_strList-wrapper
case sizes: q_obj_sizeList-wrapper case sizes: q_obj_sizeList-wrapper
case any: q_obj_anyList-wrapper case any: q_obj_anyList-wrapper
case user: q_obj_StatusList-wrapper
include include/sub-module.json include include/sub-module.json
module include/sub-module.json module include/sub-module.json
include sub-sub-module.json include sub-sub-module.json