summaryrefslogtreecommitdiffstats
path: root/tests/qapi-schema
diff options
context:
space:
mode:
authorMarkus Armbruster2019-09-27 15:46:39 +0200
committerMarkus Armbruster2019-09-28 17:17:48 +0200
commitc615550df306a7b16e75d21f65ee38898c756bac (patch)
tree1d2de035c046909657471164f51fddf51890457d /tests/qapi-schema
parentqapi: Improve reporting of redefinition (diff)
downloadqemu-c615550df306a7b16e75d21f65ee38898c756bac.tar.gz
qemu-c615550df306a7b16e75d21f65ee38898c756bac.tar.xz
qemu-c615550df306a7b16e75d21f65ee38898c756bac.zip
qapi: Improve source file read error handling
qapi-gen.py crashes when it can't open the main schema file, and when it can't read from any schema file. Lazy. Change QAPISchema.__init__() to take a file name instead of a file object. Move the open code from _include() to __init__(), so it's used for the main schema file, too. Move the read into the try for good measure, and rephrase the error message. Reporting open or read failure for the main schema file needs a QAPISourceInfo representing "no source". Make QAPISourceInfo cope with fname=None. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20190927134639.4284-27-armbru@redhat.com>
Diffstat (limited to 'tests/qapi-schema')
-rw-r--r--tests/qapi-schema/include-no-file.err2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qapi-schema/include-no-file.err b/tests/qapi-schema/include-no-file.err
index e42bcf4bc1..0a6c6bb4a9 100644
--- a/tests/qapi-schema/include-no-file.err
+++ b/tests/qapi-schema/include-no-file.err
@@ -1 +1 @@
-tests/qapi-schema/include-no-file.json:1: No such file or directory: tests/qapi-schema/include-no-file-sub.json
+tests/qapi-schema/include-no-file.json:1: can't read include file 'tests/qapi-schema/include-no-file-sub.json': No such file or directory