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: Make test-qapi.py print arrays 

The next few commits mess with array types, and having the changes
exposed in output of test-qapi.py will be useful.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190301154051.23317-2-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[Rationale added to commit message]
This commit is contained in:
Markus Armbruster 2019-03-01 16:40:45 +01:00
parent 0984a157c1
commit ca0ac758d6
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,9 @@ object UserDefTwo
member dict1: UserDefTwoDict optional=False member dict1: UserDefTwoDict optional=False
object UserDefThree object UserDefThree
member string0: str optional=False member string0: str optional=False
array UserDefOneList UserDefOne
array UserDefTwoList UserDefTwo
array TestStructList TestStruct
object ForceArrays object ForceArrays
member unused1: UserDefOneList optional=False member unused1: UserDefOneList optional=False
member unused2: UserDefTwoList optional=False member unused2: UserDefTwoList optional=False
@ -248,6 +251,7 @@ object __org.qemu_x-Union1
member type: __org.qemu_x-Union1Kind optional=False member type: __org.qemu_x-Union1Kind optional=False
tag type tag type
case __org.qemu_x-branch: q_obj_str-wrapper case __org.qemu_x-branch: q_obj_str-wrapper
array __org.qemu_x-Union1List __org.qemu_x-Union1
object __org.qemu_x-Struct2 object __org.qemu_x-Struct2
member array: __org.qemu_x-Union1List optional=False member array: __org.qemu_x-Union1List optional=False
object __org.qemu_x-Union2 object __org.qemu_x-Union2
@ -260,6 +264,8 @@ alternate __org.qemu_x-Alt
case b: __org.qemu_x-Base case b: __org.qemu_x-Base
event __ORG.QEMU_X-EVENT __org.qemu_x-Struct event __ORG.QEMU_X-EVENT __org.qemu_x-Struct
boxed=False boxed=False
array __org.qemu_x-EnumList __org.qemu_x-Enum
array __org.qemu_x-StructList __org.qemu_x-Struct
object q_obj___org.qemu_x-command-arg object q_obj___org.qemu_x-command-arg
member a: __org.qemu_x-EnumList optional=False member a: __org.qemu_x-EnumList optional=False
member b: __org.qemu_x-StructList optional=False member b: __org.qemu_x-StructList optional=False

6
tests/qapi-schema/test-qapi.py
View File

@ -32,6 +32,12 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor):
self._print_if(m.ifcond, indent=8) self._print_if(m.ifcond, indent=8)
self._print_if(ifcond) self._print_if(ifcond)
def visit_array_type(self, name, info, ifcond, element_type):
if not info:
return # suppress built-in arrays
print('array %s %s' % (name, element_type.name))
self._print_if(ifcond)
def visit_object_type(self, name, info, ifcond, base, members, variants): def visit_object_type(self, name, info, ifcond, base, members, variants):
print('object %s' % name) print('object %s' % name)
if base: if base: