Currently it is not possible for a union type to contain a
further union as one (or more) of its branches. This relaxes
that restriction and adds the calls needed to validate field
name uniqueness as unions are flattened.
In v2:
* Improve specificity of type/members descriptions for
error reporting scenarios
* Make it easier to regenerate qapi test output
* Move expected "good data" into qapi-schema-test.json
* Add description to "bad data" test files
* Add unit tests to cover union-in-union serialization
/ deserialization to/from JSON
Daniel P. Berrangé (3):
qapi: improve specificity of type/member descriptions
qapi: use env var to trigger qapi test output updates
qapi: allow unions to contain further unions
scripts/qapi/schema.py | 11 ++--
tests/qapi-schema/alternate-any.err | 2 +-
.../alternate-conflict-bool-string.err | 2 +-
tests/qapi-schema/alternate-conflict-dict.err | 2 +-
.../alternate-conflict-enum-bool.err | 2 +-
.../alternate-conflict-enum-int.err | 2 +-
.../qapi-schema/alternate-conflict-lists.err | 2 +-
.../alternate-conflict-num-string.err | 2 +-
.../qapi-schema/alternate-conflict-string.err | 2 +-
tests/qapi-schema/alternate-nested.err | 2 +-
tests/qapi-schema/alternate-unknown.err | 2 +-
tests/qapi-schema/args-member-unknown.err | 2 +-
tests/qapi-schema/enum-clash-member.err | 2 +-
tests/qapi-schema/features-duplicate-name.err | 2 +-
tests/qapi-schema/meson.build | 2 +
tests/qapi-schema/qapi-schema-test.json | 32 ++++++++++
tests/qapi-schema/qapi-schema-test.out | 29 ++++++++++
tests/qapi-schema/struct-base-clash-deep.err | 2 +-
tests/qapi-schema/struct-base-clash.err | 2 +-
.../qapi-schema/struct-member-name-clash.err | 2 +-
tests/qapi-schema/test-qapi.py | 3 +-
tests/qapi-schema/union-bad-base.err | 2 +-
tests/qapi-schema/union-int-branch.err | 2 +-
.../union-invalid-union-subfield.err | 2 +
.../union-invalid-union-subfield.json | 30 ++++++++++
.../union-invalid-union-subfield.out | 0
.../union-invalid-union-subtype.err | 2 +
.../union-invalid-union-subtype.json | 29 ++++++++++
.../union-invalid-union-subtype.out | 0
tests/qapi-schema/union-unknown.err | 2 +-
tests/unit/test-qobject-input-visitor.c | 47 +++++++++++++++
tests/unit/test-qobject-output-visitor.c | 58 +++++++++++++++++++
32 files changed, 257 insertions(+), 26 deletions(-)
create mode 100644 tests/qapi-schema/union-invalid-union-subfield.err
create mode 100644 tests/qapi-schema/union-invalid-union-subfield.json
create mode 100644 tests/qapi-schema/union-invalid-union-subfield.out
create mode 100644 tests/qapi-schema/union-invalid-union-subtype.err
create mode 100644 tests/qapi-schema/union-invalid-union-subtype.json
create mode 100644 tests/qapi-schema/union-invalid-union-subtype.out
--
2.39.2
