[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/26] tests/qapi-schema: Restore test case for flat
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 17/26] tests/qapi-schema: Restore test case for flat union base bug |
Date: |
Tue, 4 Aug 2015 11:18:07 +0200 |
Test case added in commit 2fc0043, and messed up in commit 5223070.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/qapi-schema/qapi-schema-test.json | 5 +++--
tests/qapi-schema/qapi-schema-test.out | 8 ++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index 829dd30..a9e5aab 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -31,7 +31,7 @@
'data': { 'boolean': 'bool' } }
{ 'struct': 'UserDefB',
- 'data': { 'integer': 'int' } }
+ 'data': { 'intb': 'int' } }
{ 'union': 'UserDefFlatUnion',
'base': 'UserDefUnionBase', # intentional forward reference
@@ -40,9 +40,10 @@
'value2' : 'UserDefB',
'value3' : 'UserDefB' } }
# FIXME generated struct UserDefFlatUnion has members for direct base
-# UserDefOne, but lacks members for indirect base UserDefZero
+# UserDefUnionBase, but lacks members for indirect base UserDefZero
{ 'struct': 'UserDefUnionBase',
+ 'base': 'UserDefZero',
'data': { 'string': 'str', 'enum1': 'EnumOne' } }
# this variant of UserDefFlatUnion defaults to a union that uses fields with
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index a4291db..b0b7187 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -6,9 +6,9 @@
OrderedDict([('struct', 'UserDefTwoDict'), ('data', OrderedDict([('string1',
'str'), ('dict2', 'UserDefTwoDictDict'), ('*dict3', 'UserDefTwoDictDict')]))]),
OrderedDict([('struct', 'UserDefTwo'), ('data', OrderedDict([('string0',
'str'), ('dict1', 'UserDefTwoDict')]))]),
OrderedDict([('struct', 'UserDefA'), ('data', OrderedDict([('boolean',
'bool')]))]),
- OrderedDict([('struct', 'UserDefB'), ('data', OrderedDict([('integer',
'int')]))]),
+ OrderedDict([('struct', 'UserDefB'), ('data', OrderedDict([('intb',
'int')]))]),
OrderedDict([('union', 'UserDefFlatUnion'), ('base', 'UserDefUnionBase'),
('discriminator', 'enum1'), ('data', OrderedDict([('value1', 'UserDefA'),
('value2', 'UserDefB'), ('value3', 'UserDefB')]))]),
- OrderedDict([('struct', 'UserDefUnionBase'), ('data', OrderedDict([('string',
'str'), ('enum1', 'EnumOne')]))]),
+ OrderedDict([('struct', 'UserDefUnionBase'), ('base', 'UserDefZero'),
('data', OrderedDict([('string', 'str'), ('enum1', 'EnumOne')]))]),
OrderedDict([('union', 'UserDefFlatUnion2'), ('base', 'UserDefUnionBase'),
('discriminator', 'enum1'), ('data', OrderedDict([('value1', 'UserDefC'),
('value2', 'UserDefB'), ('value3', 'UserDefA')]))]),
OrderedDict([('alternate', 'UserDefAlternate'), ('data', OrderedDict([('uda',
'UserDefA'), ('s', 'str'), ('i', 'int')]))]),
OrderedDict([('struct', 'UserDefC'), ('data', OrderedDict([('string1',
'str'), ('string2', 'str')]))]),
@@ -45,8 +45,8 @@
OrderedDict([('struct', 'UserDefTwoDict'), ('data', OrderedDict([('string1',
'str'), ('dict2', 'UserDefTwoDictDict'), ('*dict3', 'UserDefTwoDictDict')]))]),
OrderedDict([('struct', 'UserDefTwo'), ('data', OrderedDict([('string0',
'str'), ('dict1', 'UserDefTwoDict')]))]),
OrderedDict([('struct', 'UserDefA'), ('data', OrderedDict([('boolean',
'bool')]))]),
- OrderedDict([('struct', 'UserDefB'), ('data', OrderedDict([('integer',
'int')]))]),
- OrderedDict([('struct', 'UserDefUnionBase'), ('data', OrderedDict([('string',
'str'), ('enum1', 'EnumOne')]))]),
+ OrderedDict([('struct', 'UserDefB'), ('data', OrderedDict([('intb',
'int')]))]),
+ OrderedDict([('struct', 'UserDefUnionBase'), ('base', 'UserDefZero'),
('data', OrderedDict([('string', 'str'), ('enum1', 'EnumOne')]))]),
OrderedDict([('struct', 'UserDefC'), ('data', OrderedDict([('string1',
'str'), ('string2', 'str')]))]),
OrderedDict([('struct', 'UserDefOptions'), ('data', OrderedDict([('*i64',
['int']), ('*u64', ['uint64']), ('*u16', ['uint16']), ('*i64x', 'int'),
('*u64x', 'uint64')]))]),
OrderedDict([('struct', 'EventStructOne'), ('data', OrderedDict([('struct1',
'UserDefOne'), ('string', 'str'), ('*enum2', 'EnumOne')]))]),
--
2.4.3
- Re: [Qemu-devel] [PATCH 07/26] qapi: Fix generated code when flat union has member 'kind', (continued)
- [Qemu-devel] [PATCH 20/26] qapi: Fix to reject union command and event arguments, Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 25/26] qapi-commands: Drop useless initialization, Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 16/26] qapi: Document flaws in checking of names, Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 17/26] tests/qapi-schema: Restore test case for flat union base bug,
Markus Armbruster <=
- [Qemu-devel] [PATCH 14/26] qapi: Document that input visitor semantics are prone to leaks, Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 19/26] qapi-tests: New tests for union, alternate command arguments, Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 03/26] qapi: Simplify guardname(), Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 13/26] tests/qapi-schema: Document events with base don't work, Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 09/26] qapi-visit: Fix generated code when schema has forward refs, Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 06/26] qapi: Drop unused and useless parameters and variables, Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 23/26] qapi-commands: Inline gen_marshal_output_call(), Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 11/26] qapi-visit: Fix two name arguments passed to visitors, Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 12/26] tests/qapi-schema: Document alternate's enum lacks visit function, Markus Armbruster, 2015/08/04
- [Qemu-devel] [PATCH 22/26] qapi-commands: Fix gen_err_check(e) for e and e != 'local_err', Markus Armbruster, 2015/08/04