tests/qapi-schema: Improve doc / expression mismatch coverage
New tests doc-before-include.json and doc-before-pragma.json show we fail to reject a misplaced expression comment. New test doc-no-symbol.json shows a bad error message. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1489582656-31133-31-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
75b50196d9
commit
2028be8eea
@ -369,6 +369,8 @@ qapi-schema += command-int.json
|
||||
qapi-schema += comments.json
|
||||
qapi-schema += doc-bad-args.json
|
||||
qapi-schema += doc-bad-symbol.json
|
||||
qapi-schema += doc-before-include.json
|
||||
qapi-schema += doc-before-pragma.json
|
||||
qapi-schema += doc-duplicated-arg.json
|
||||
qapi-schema += doc-duplicated-return.json
|
||||
qapi-schema += doc-duplicated-since.json
|
||||
@ -385,6 +387,7 @@ qapi-schema += doc-missing.json
|
||||
qapi-schema += doc-missing-colon.json
|
||||
qapi-schema += doc-missing-expr.json
|
||||
qapi-schema += doc-missing-space.json
|
||||
qapi-schema += doc-no-symbol.json
|
||||
qapi-schema += double-data.json
|
||||
qapi-schema += double-type.json
|
||||
qapi-schema += duplicate-key.json
|
||||
|
0
tests/qapi-schema/doc-before-include.err
Normal file
0
tests/qapi-schema/doc-before-include.err
Normal file
1
tests/qapi-schema/doc-before-include.exit
Normal file
1
tests/qapi-schema/doc-before-include.exit
Normal file
@ -0,0 +1 @@
|
||||
0
|
8
tests/qapi-schema/doc-before-include.json
Normal file
8
tests/qapi-schema/doc-before-include.json
Normal file
@ -0,0 +1,8 @@
|
||||
# Doc comment separated from defining expression by non-defining expression
|
||||
# BUG: not rejected
|
||||
|
||||
##
|
||||
# @foo:
|
||||
##
|
||||
{ 'include': 'empty.json' }
|
||||
{ 'struct': 'foo', 'data': {} }
|
4
tests/qapi-schema/doc-before-include.out
Normal file
4
tests/qapi-schema/doc-before-include.out
Normal file
@ -0,0 +1,4 @@
|
||||
enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
|
||||
prefix QTYPE
|
||||
object foo
|
||||
object q_empty
|
0
tests/qapi-schema/doc-before-pragma.err
Normal file
0
tests/qapi-schema/doc-before-pragma.err
Normal file
1
tests/qapi-schema/doc-before-pragma.exit
Normal file
1
tests/qapi-schema/doc-before-pragma.exit
Normal file
@ -0,0 +1 @@
|
||||
0
|
8
tests/qapi-schema/doc-before-pragma.json
Normal file
8
tests/qapi-schema/doc-before-pragma.json
Normal file
@ -0,0 +1,8 @@
|
||||
# Doc comment separated from defining expression by non-defining expression
|
||||
# BUG: not rejected
|
||||
|
||||
##
|
||||
# @foo:
|
||||
##
|
||||
{ 'pragma': {} }
|
||||
{ 'struct': 'foo', 'data': {} }
|
4
tests/qapi-schema/doc-before-pragma.out
Normal file
4
tests/qapi-schema/doc-before-pragma.out
Normal file
@ -0,0 +1,4 @@
|
||||
enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
|
||||
prefix QTYPE
|
||||
object foo
|
||||
object q_empty
|
1
tests/qapi-schema/doc-no-symbol.err
Normal file
1
tests/qapi-schema/doc-no-symbol.err
Normal file
@ -0,0 +1 @@
|
||||
tests/qapi-schema/doc-no-symbol.json:4: Definition of 'foo' follows documentation for 'None'
|
1
tests/qapi-schema/doc-no-symbol.exit
Normal file
1
tests/qapi-schema/doc-no-symbol.exit
Normal file
@ -0,0 +1 @@
|
||||
1
|
7
tests/qapi-schema/doc-no-symbol.json
Normal file
7
tests/qapi-schema/doc-no-symbol.json
Normal file
@ -0,0 +1,7 @@
|
||||
# Documentation for expression lacks symbol
|
||||
# BUG: Error message claims it has symbol 'None'
|
||||
|
||||
##
|
||||
# foo:
|
||||
##
|
||||
{ 'command': 'foo', 'data': {'a': 'int'} }
|
0
tests/qapi-schema/doc-no-symbol.out
Normal file
0
tests/qapi-schema/doc-no-symbol.out
Normal file
Loading…
Reference in New Issue
Block a user