summaryrefslogtreecommitdiffstats
path: root/tests/qapi-schema/flat-union-string-discriminator.err
diff options
context:
space:
mode:
authorMarkus Armbruster2019-09-27 15:46:29 +0200
committerMarkus Armbruster2019-09-28 17:17:19 +0200
commitfa110c6a9e6c0ae0ce2d4bcf5771cdb8c3e53a7e (patch)
tree6f9a4338cdd579a82e4144a0b04eabce8b7ae5e3 /tests/qapi-schema/flat-union-string-discriminator.err
parentqapi: Inline check_name() into check_union() (diff)
downloadqemu-fa110c6a9e6c0ae0ce2d4bcf5771cdb8c3e53a7e.tar.gz
qemu-fa110c6a9e6c0ae0ce2d4bcf5771cdb8c3e53a7e.tar.xz
qemu-fa110c6a9e6c0ae0ce2d4bcf5771cdb8c3e53a7e.zip
qapi: Move context-sensitive checking to the proper place
When we introduced the QAPISchema intermediate representation (commit ac88219a6c7), we took a shortcut: we left check_exprs() & friends alone instead of moving semantic checks into the QAPISchemaFOO.check(). The .check() assert check_exprs() did its job. Time to finish the conversion job. Move exactly the context-sensitive checks to the .check(). They replace assertions there. Context-free checks stay put. Fixes the misleading optional tag error demonstrated by test flat-union-optional-discriminator. A few other error message improve. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20190927134639.4284-17-armbru@redhat.com>
Diffstat (limited to 'tests/qapi-schema/flat-union-string-discriminator.err')
-rw-r--r--tests/qapi-schema/flat-union-string-discriminator.err2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qapi-schema/flat-union-string-discriminator.err b/tests/qapi-schema/flat-union-string-discriminator.err
index f5635a5774..fb499188aa 100644
--- a/tests/qapi-schema/flat-union-string-discriminator.err
+++ b/tests/qapi-schema/flat-union-string-discriminator.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-string-discriminator.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-string-discriminator.json:13: discriminator 'kind' must be of enumeration type
+tests/qapi-schema/flat-union-string-discriminator.json:13: discriminator member 'kind' of base type 'TestBase' must be of enum type