Skip to content

Commit

Permalink
qapi: Change frontend error messages to start with lower case
Browse files Browse the repository at this point in the history
Starting error messages with a capital letter complicates things when
text can get interpolated both at the beginning and in the middle of
an error message.  The next patch will do that.  Switch to lower case
to keep it simpler.

For what it's worth, the GNU Coding Standards advise the message
"should not begin with a capital letter when it follows a program name
and/or file name, because that isn’t the beginning of a sentence. (The
sentence conceptually starts at the beginning of the line.)"

While there, avoid breaking lines containing multiple arguments in the
middle of an argument.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190927134639.4284-7-armbru@redhat.com>
  • Loading branch information
Markus Armbruster committed Sep 28, 2019
1 parent 638c4af commit 2ab218a
Show file tree
Hide file tree
Showing 121 changed files with 222 additions and 210 deletions.
192 changes: 102 additions & 90 deletions scripts/qapi/common.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-any.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-any.json: In alternate 'Alt':
tests/qapi-schema/alternate-any.json:2: Alternate 'Alt' member 'one' cannot use type 'any'
tests/qapi-schema/alternate-any.json:2: alternate 'Alt' member 'one' cannot use type 'any'
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-array.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-array.json: In alternate 'Alt':
tests/qapi-schema/alternate-array.json:5: Member 'two' of alternate 'Alt' cannot be an array
tests/qapi-schema/alternate-array.json:5: member 'two' of alternate 'Alt' cannot be an array
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-base.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-base.json:4: Unknown key 'base' in alternate 'Alt'
tests/qapi-schema/alternate-base.json:4: unknown key 'base' in alternate 'Alt'
Valid keys are 'alternate', 'data', 'if'.
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-conflict-bool-string.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-bool-string.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-bool-string.json:2: Alternate 'Alt' member 'two' can't be distinguished from member 'one'
tests/qapi-schema/alternate-conflict-bool-string.json:2: alternate 'Alt' member 'two' can't be distinguished from member 'one'
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-conflict-dict.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-dict.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-dict.json:6: Alternate 'Alt' member 'two' can't be distinguished from member 'one'
tests/qapi-schema/alternate-conflict-dict.json:6: alternate 'Alt' member 'two' can't be distinguished from member 'one'
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-conflict-enum-bool.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-enum-bool.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-enum-bool.json:4: Alternate 'Alt' member 'two' can't be distinguished from member 'one'
tests/qapi-schema/alternate-conflict-enum-bool.json:4: alternate 'Alt' member 'two' can't be distinguished from member 'one'
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-conflict-enum-int.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-enum-int.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-enum-int.json:4: Alternate 'Alt' member 'two' can't be distinguished from member 'one'
tests/qapi-schema/alternate-conflict-enum-int.json:4: alternate 'Alt' member 'two' can't be distinguished from member 'one'
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-conflict-num-string.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-num-string.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-num-string.json:2: Alternate 'Alt' member 'two' can't be distinguished from member 'one'
tests/qapi-schema/alternate-conflict-num-string.json:2: alternate 'Alt' member 'two' can't be distinguished from member 'one'
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-conflict-string.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-string.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-string.json:2: Alternate 'Alt' member 'two' can't be distinguished from member 'one'
tests/qapi-schema/alternate-conflict-string.json:2: alternate 'Alt' member 'two' can't be distinguished from member 'one'
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-empty.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-empty.json: In alternate 'Alt':
tests/qapi-schema/alternate-empty.json:2: Alternate 'Alt' cannot have empty 'data'
tests/qapi-schema/alternate-empty.json:2: alternate 'Alt' cannot have empty 'data'
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-invalid-dict.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-invalid-dict.json: In alternate 'Alt':
tests/qapi-schema/alternate-invalid-dict.json:2: Key 'type' is missing from member 'two' of alternate 'Alt'
tests/qapi-schema/alternate-invalid-dict.json:2: key 'type' is missing from member 'two' of alternate 'Alt'
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-nested.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-nested.json: In alternate 'Alt2':
tests/qapi-schema/alternate-nested.json:4: Member 'nested' of alternate 'Alt2' cannot use alternate type 'Alt1'
tests/qapi-schema/alternate-nested.json:4: member 'nested' of alternate 'Alt2' cannot use alternate type 'Alt1'
2 changes: 1 addition & 1 deletion tests/qapi-schema/alternate-unknown.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-unknown.json: In alternate 'Alt':
tests/qapi-schema/alternate-unknown.json:2: Member 'unknown' of alternate 'Alt' uses unknown type 'MissingType'
tests/qapi-schema/alternate-unknown.json:2: member 'unknown' of alternate 'Alt' uses unknown type 'MissingType'
2 changes: 1 addition & 1 deletion tests/qapi-schema/args-array-empty.err
@@ -1,2 +1,2 @@
tests/qapi-schema/args-array-empty.json: In command 'oops':
tests/qapi-schema/args-array-empty.json:2: Member 'empty' of 'data' for command 'oops': array type must contain single type name
tests/qapi-schema/args-array-empty.json:2: member 'empty' of 'data' for command 'oops': array type must contain single type name
2 changes: 1 addition & 1 deletion tests/qapi-schema/args-array-unknown.err
@@ -1,2 +1,2 @@
tests/qapi-schema/args-array-unknown.json: In command 'oops':
tests/qapi-schema/args-array-unknown.json:2: Member 'array' of 'data' for command 'oops' uses unknown type 'NoSuchType'
tests/qapi-schema/args-array-unknown.json:2: member 'array' of 'data' for command 'oops' uses unknown type 'NoSuchType'
2 changes: 1 addition & 1 deletion tests/qapi-schema/args-member-array-bad.err
@@ -1,2 +1,2 @@
tests/qapi-schema/args-member-array-bad.json: In command 'oops':
tests/qapi-schema/args-member-array-bad.json:2: Member 'member' of 'data' for command 'oops': array type must contain single type name
tests/qapi-schema/args-member-array-bad.json:2: member 'member' of 'data' for command 'oops': array type must contain single type name
2 changes: 1 addition & 1 deletion tests/qapi-schema/args-member-case.err
@@ -1,2 +1,2 @@
tests/qapi-schema/args-member-case.json: In command 'no-way-this-will-get-whitelisted':
tests/qapi-schema/args-member-case.json:2: Member of 'data' for command 'no-way-this-will-get-whitelisted' uses uppercase in name 'Arg'
tests/qapi-schema/args-member-case.json:2: member of 'data' for command 'no-way-this-will-get-whitelisted' uses uppercase in name 'Arg'
2 changes: 1 addition & 1 deletion tests/qapi-schema/args-member-unknown.err
@@ -1,2 +1,2 @@
tests/qapi-schema/args-member-unknown.json: In command 'oops':
tests/qapi-schema/args-member-unknown.json:2: Member 'member' of 'data' for command 'oops' uses unknown type 'NoSuchType'
tests/qapi-schema/args-member-unknown.json:2: member 'member' of 'data' for command 'oops' uses unknown type 'NoSuchType'
2 changes: 1 addition & 1 deletion tests/qapi-schema/bad-type-int.err
@@ -1 +1 @@
tests/qapi-schema/bad-type-int.json:3:13: Stray '123'
tests/qapi-schema/bad-type-int.json:3:13: stray '123'
2 changes: 1 addition & 1 deletion tests/qapi-schema/base-cycle-direct.err
@@ -1,2 +1,2 @@
tests/qapi-schema/base-cycle-direct.json: In struct 'Loopy':
tests/qapi-schema/base-cycle-direct.json:2: Object Loopy contains itself
tests/qapi-schema/base-cycle-direct.json:2: object Loopy contains itself
2 changes: 1 addition & 1 deletion tests/qapi-schema/base-cycle-indirect.err
@@ -1,2 +1,2 @@
tests/qapi-schema/base-cycle-indirect.json: In struct 'Base1':
tests/qapi-schema/base-cycle-indirect.json:2: Object Base1 contains itself
tests/qapi-schema/base-cycle-indirect.json:2: object Base1 contains itself
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-bad-alternate-member.err
@@ -1 +1 @@
tests/qapi-schema/doc-bad-alternate-member.json:3: The following documented members are not in the declaration: aa, bb
tests/qapi-schema/doc-bad-alternate-member.json:3: the following documented members are not in the declaration: aa, bb
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-bad-command-arg.err
@@ -1 +1 @@
tests/qapi-schema/doc-bad-command-arg.json:3: The following documented members are not in the declaration: b
tests/qapi-schema/doc-bad-command-arg.json:3: the following documented members are not in the declaration: b
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-bad-symbol.err
@@ -1,2 +1,2 @@
tests/qapi-schema/doc-bad-symbol.json: In command 'foo':
tests/qapi-schema/doc-bad-symbol.json:6: Definition of 'foo' follows documentation for 'food'
tests/qapi-schema/doc-bad-symbol.json:6: definition of 'foo' follows documentation for 'food'
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-bad-union-member.err
@@ -1 +1 @@
tests/qapi-schema/doc-bad-union-member.json:3: The following documented members are not in the declaration: a, b
tests/qapi-schema/doc-bad-union-member.json:3: the following documented members are not in the declaration: a, b
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-before-include.err
@@ -1 +1 @@
tests/qapi-schema/doc-before-include.json:3: Documentation for 'foo' is not followed by the definition
tests/qapi-schema/doc-before-include.json:3: documentation for 'foo' is not followed by the definition
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-before-pragma.err
@@ -1 +1 @@
tests/qapi-schema/doc-before-pragma.json:3: Documentation for 'foo' is not followed by the definition
tests/qapi-schema/doc-before-pragma.json:3: documentation for 'foo' is not followed by the definition
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-duplicated-return.err
@@ -1 +1 @@
tests/qapi-schema/doc-duplicated-return.json:7:1: Duplicated 'Returns' section
tests/qapi-schema/doc-duplicated-return.json:7:1: duplicated 'Returns' section
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-duplicated-since.err
@@ -1 +1 @@
tests/qapi-schema/doc-duplicated-since.json:7:1: Duplicated 'Since' section
tests/qapi-schema/doc-duplicated-since.json:7:1: duplicated 'Since' section
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-empty-arg.err
@@ -1 +1 @@
tests/qapi-schema/doc-empty-arg.json:5:1: Invalid parameter name
tests/qapi-schema/doc-empty-arg.json:5:1: invalid parameter name
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-empty-section.err
@@ -1 +1 @@
tests/qapi-schema/doc-empty-section.json:7:1: Empty doc section 'Note'
tests/qapi-schema/doc-empty-section.json:7:1: empty doc section 'Note'
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-empty-symbol.err
@@ -1 +1 @@
tests/qapi-schema/doc-empty-symbol.json:4:1: Invalid name
tests/qapi-schema/doc-empty-symbol.json:4:1: invalid name
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-invalid-end.err
@@ -1 +1 @@
tests/qapi-schema/doc-invalid-end.json:5:2: Documentation comment must end with '##'
tests/qapi-schema/doc-invalid-end.json:5:2: documentation comment must end with '##'
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-invalid-end2.err
@@ -1 +1 @@
tests/qapi-schema/doc-invalid-end2.json:5:1: Junk after '##' at end of documentation comment
tests/qapi-schema/doc-invalid-end2.json:5:1: junk after '##' at end of documentation comment
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-invalid-start.err
@@ -1 +1 @@
tests/qapi-schema/doc-invalid-start.json:3:1: Junk after '##' at start of documentation comment
tests/qapi-schema/doc-invalid-start.json:3:1: junk after '##' at start of documentation comment
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-missing-colon.err
@@ -1 +1 @@
tests/qapi-schema/doc-missing-colon.json:4:1: Line should end with ':'
tests/qapi-schema/doc-missing-colon.json:4:1: line should end with ':'
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-missing-expr.err
@@ -1 +1 @@
tests/qapi-schema/doc-missing-expr.json:3: Documentation for 'bar' is not followed by the definition
tests/qapi-schema/doc-missing-expr.json:3: documentation for 'bar' is not followed by the definition
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-missing-space.err
@@ -1 +1 @@
tests/qapi-schema/doc-missing-space.json:5:1: Missing space after #
tests/qapi-schema/doc-missing-space.json:5:1: missing space after #
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-missing.err
@@ -1 +1 @@
tests/qapi-schema/doc-missing.json:5: Definition missing documentation comment
tests/qapi-schema/doc-missing.json:5: definition missing documentation comment
2 changes: 1 addition & 1 deletion tests/qapi-schema/doc-no-symbol.err
@@ -1 +1 @@
tests/qapi-schema/doc-no-symbol.json:3: Definition documentation required
tests/qapi-schema/doc-no-symbol.json:3: definition documentation required
2 changes: 1 addition & 1 deletion tests/qapi-schema/double-type.err
@@ -1,2 +1,2 @@
tests/qapi-schema/double-type.json:2: Unknown key 'command' in struct 'bar'
tests/qapi-schema/double-type.json:2: unknown key 'command' in struct 'bar'
Valid keys are 'base', 'data', 'features', 'if', 'struct'.
2 changes: 1 addition & 1 deletion tests/qapi-schema/duplicate-key.err
@@ -1 +1 @@
tests/qapi-schema/duplicate-key.json:3:10: Duplicate key 'key'
tests/qapi-schema/duplicate-key.json:3:10: duplicate key 'key'
2 changes: 1 addition & 1 deletion tests/qapi-schema/enum-bad-member.err
@@ -1,2 +1,2 @@
tests/qapi-schema/enum-bad-member.json: In enum 'MyEnum':
tests/qapi-schema/enum-bad-member.json:2: Member of enum 'MyEnum' requires a string name
tests/qapi-schema/enum-bad-member.json:2: member of enum 'MyEnum' requires a string name
2 changes: 1 addition & 1 deletion tests/qapi-schema/enum-bad-name.err
@@ -1,2 +1,2 @@
tests/qapi-schema/enum-bad-name.json: In enum 'MyEnum':
tests/qapi-schema/enum-bad-name.json:3: Member of enum 'MyEnum' uses invalid name 'not\possible'
tests/qapi-schema/enum-bad-name.json:3: member of enum 'MyEnum' uses invalid name 'not\possible'
2 changes: 1 addition & 1 deletion tests/qapi-schema/enum-bad-prefix.err
@@ -1,2 +1,2 @@
tests/qapi-schema/enum-bad-prefix.json: In enum 'MyEnum':
tests/qapi-schema/enum-bad-prefix.json:2: Enum 'MyEnum' requires a string for 'prefix'
tests/qapi-schema/enum-bad-prefix.json:2: enum 'MyEnum' requires a string for 'prefix'
2 changes: 1 addition & 1 deletion tests/qapi-schema/enum-dict-member-unknown.err
@@ -1,3 +1,3 @@
tests/qapi-schema/enum-dict-member-unknown.json: In enum 'MyEnum':
tests/qapi-schema/enum-dict-member-unknown.json:2: Unknown key 'bad-key' in member of enum 'MyEnum'
tests/qapi-schema/enum-dict-member-unknown.json:2: unknown key 'bad-key' in member of enum 'MyEnum'
Valid keys are 'if', 'name'.
2 changes: 1 addition & 1 deletion tests/qapi-schema/enum-int-member.err
@@ -1 +1 @@
tests/qapi-schema/enum-int-member.json:3:31: Stray '1'
tests/qapi-schema/enum-int-member.json:3:31: stray '1'
2 changes: 1 addition & 1 deletion tests/qapi-schema/enum-member-case.err
@@ -1,2 +1,2 @@
tests/qapi-schema/enum-member-case.json: In enum 'NoWayThisWillGetWhitelisted':
tests/qapi-schema/enum-member-case.json:4: Member of enum 'NoWayThisWillGetWhitelisted' uses uppercase in name 'Value'
tests/qapi-schema/enum-member-case.json:4: member of enum 'NoWayThisWillGetWhitelisted' uses uppercase in name 'Value'
2 changes: 1 addition & 1 deletion tests/qapi-schema/enum-missing-data.err
@@ -1 +1 @@
tests/qapi-schema/enum-missing-data.json:2: Key 'data' is missing from enum 'MyEnum'
tests/qapi-schema/enum-missing-data.json:2: key 'data' is missing from enum 'MyEnum'
2 changes: 1 addition & 1 deletion tests/qapi-schema/enum-wrong-data.err
@@ -1,2 +1,2 @@
tests/qapi-schema/enum-wrong-data.json: In enum 'MyEnum':
tests/qapi-schema/enum-wrong-data.json:2: Enum 'MyEnum' requires an array for 'data'
tests/qapi-schema/enum-wrong-data.json:2: enum 'MyEnum' requires an array for 'data'
2 changes: 1 addition & 1 deletion tests/qapi-schema/escape-outside-string.err
@@ -1 +1 @@
tests/qapi-schema/escape-outside-string.json:3:27: Stray '\'
tests/qapi-schema/escape-outside-string.json:3:27: stray '\'
2 changes: 1 addition & 1 deletion tests/qapi-schema/event-boxed-empty.err
@@ -1,2 +1,2 @@
tests/qapi-schema/event-boxed-empty.json: In event 'FOO':
tests/qapi-schema/event-boxed-empty.json:2: Use of 'boxed' requires 'data'
tests/qapi-schema/event-boxed-empty.json:2: use of 'boxed' requires 'data'
2 changes: 1 addition & 1 deletion tests/qapi-schema/event-member-invalid-dict.err
@@ -1,2 +1,2 @@
tests/qapi-schema/event-member-invalid-dict.json: In event 'EVENT_A':
tests/qapi-schema/event-member-invalid-dict.json:1: Key 'type' is missing from member 'a' of 'data' for event 'EVENT_A'
tests/qapi-schema/event-member-invalid-dict.json:1: key 'type' is missing from member 'a' of 'data' for event 'EVENT_A'
2 changes: 1 addition & 1 deletion tests/qapi-schema/event-nest-struct.err
@@ -1,2 +1,2 @@
tests/qapi-schema/event-nest-struct.json: In event 'EVENT_A':
tests/qapi-schema/event-nest-struct.json:1: Member 'a' of 'data' for event 'EVENT_A' should be a type name
tests/qapi-schema/event-nest-struct.json:1: member 'a' of 'data' for event 'EVENT_A' should be a type name
2 changes: 1 addition & 1 deletion tests/qapi-schema/features-bad-type.err
@@ -1,2 +1,2 @@
tests/qapi-schema/features-bad-type.json: In struct 'FeatureStruct0':
tests/qapi-schema/features-bad-type.json:1: Feature of struct FeatureStruct0 requires a string name
tests/qapi-schema/features-bad-type.json:1: feature of struct FeatureStruct0 requires a string name
2 changes: 1 addition & 1 deletion tests/qapi-schema/features-missing-name.err
@@ -1,2 +1,2 @@
tests/qapi-schema/features-missing-name.json: In struct 'FeatureStruct0':
tests/qapi-schema/features-missing-name.json:1: Key 'name' is missing from feature of struct FeatureStruct0
tests/qapi-schema/features-missing-name.json:1: key 'name' is missing from feature of struct FeatureStruct0
2 changes: 1 addition & 1 deletion tests/qapi-schema/features-name-bad-type.err
@@ -1,2 +1,2 @@
tests/qapi-schema/features-name-bad-type.json: In struct 'FeatureStruct0':
tests/qapi-schema/features-name-bad-type.json:1: Feature of struct FeatureStruct0 requires a string name
tests/qapi-schema/features-name-bad-type.json:1: feature of struct FeatureStruct0 requires a string name
2 changes: 1 addition & 1 deletion tests/qapi-schema/features-no-list.err
@@ -1,2 +1,2 @@
tests/qapi-schema/features-no-list.json: In struct 'FeatureStruct0':
tests/qapi-schema/features-no-list.json:1: Struct 'FeatureStruct0' requires an array for 'features'
tests/qapi-schema/features-no-list.json:1: struct 'FeatureStruct0' requires an array for 'features'
2 changes: 1 addition & 1 deletion tests/qapi-schema/features-unknown-key.err
@@ -1,3 +1,3 @@
tests/qapi-schema/features-unknown-key.json: In struct 'FeatureStruct0':
tests/qapi-schema/features-unknown-key.json:1: Unknown key 'colour' in feature of struct FeatureStruct0
tests/qapi-schema/features-unknown-key.json:1: unknown key 'colour' in feature of struct FeatureStruct0
Valid keys are 'if', 'name'.
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-array-branch.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-array-branch.json: In union 'TestUnion':
tests/qapi-schema/flat-union-array-branch.json:8: Member 'value1' of union 'TestUnion' cannot be an array
tests/qapi-schema/flat-union-array-branch.json:8: member 'value1' of union 'TestUnion' cannot be an array
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-bad-discriminator.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-bad-discriminator.json: In union 'TestUnion':
tests/qapi-schema/flat-union-bad-discriminator.json:11: Discriminator of flat union 'TestUnion' requires a string name
tests/qapi-schema/flat-union-bad-discriminator.json:11: discriminator of flat union 'TestUnion' requires a string name
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-discriminator-bad-name.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-discriminator-bad-name.json: In union 'MyUnion':
tests/qapi-schema/flat-union-discriminator-bad-name.json:7: Discriminator of flat union 'MyUnion' does not allow optional name '*switch'
tests/qapi-schema/flat-union-discriminator-bad-name.json:7: discriminator of flat union 'MyUnion' does not allow optional name '*switch'
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-empty.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-empty.json: In union 'Union':
tests/qapi-schema/flat-union-empty.json:4: Union 'Union' has no branches
tests/qapi-schema/flat-union-empty.json:4: union 'Union' has no branches
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-inline-invalid-dict.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-inline-invalid-dict.json: In union 'TestUnion':
tests/qapi-schema/flat-union-inline-invalid-dict.json:7: Key 'type' is missing from member 'value1' of union 'TestUnion'
tests/qapi-schema/flat-union-inline-invalid-dict.json:7: key 'type' is missing from member 'value1' of union 'TestUnion'
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-inline.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-inline.json: In union 'TestUnion':
tests/qapi-schema/flat-union-inline.json:7: Member 'value1' of union 'TestUnion' should be a type name
tests/qapi-schema/flat-union-inline.json:7: member 'value1' of union 'TestUnion' should be a type name
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-int-branch.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-int-branch.json: In union 'TestUnion':
tests/qapi-schema/flat-union-int-branch.json:8: Member 'value1' of union 'TestUnion' cannot use built-in type 'int'
tests/qapi-schema/flat-union-int-branch.json:8: member 'value1' of union 'TestUnion' cannot use built-in type 'int'
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-invalid-branch-key.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-invalid-branch-key.json: In union 'TestUnion':
tests/qapi-schema/flat-union-invalid-branch-key.json:13: Discriminator value 'value_wrong' is not found in enum 'TestEnum'
tests/qapi-schema/flat-union-invalid-branch-key.json:13: discriminator value 'value_wrong' is not found in enum 'TestEnum'
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-invalid-discriminator.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-invalid-discriminator.json: In union 'TestUnion':
tests/qapi-schema/flat-union-invalid-discriminator.json:10: Discriminator 'enum_wrong' is not a member of 'base'
tests/qapi-schema/flat-union-invalid-discriminator.json:10: discriminator 'enum_wrong' is not a member of 'base'
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-invalid-if-discriminator.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-invalid-if-discriminator.json: In union 'TestUnion':
tests/qapi-schema/flat-union-invalid-if-discriminator.json:10: The discriminator 'enum1' for union TestUnion must not be conditional
tests/qapi-schema/flat-union-invalid-if-discriminator.json:10: the discriminator 'enum1' for union TestUnion must not be conditional
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-no-base.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-no-base.json: In union 'TestUnion':
tests/qapi-schema/flat-union-no-base.json:9: Flat union 'TestUnion' must have a base
tests/qapi-schema/flat-union-no-base.json:9: flat union 'TestUnion' must have a base
2 changes: 1 addition & 1 deletion tests/qapi-schema/flat-union-optional-discriminator.err
@@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-optional-discriminator.json: In union 'MyUnion':
tests/qapi-schema/flat-union-optional-discriminator.json:7: Discriminator 'switch' is not a member of 'base'
tests/qapi-schema/flat-union-optional-discriminator.json:7: discriminator 'switch' is not a member of 'base'
2 changes: 1 addition & 1 deletion 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 'kind' must be of enumeration type
2 changes: 1 addition & 1 deletion tests/qapi-schema/funny-char.err
@@ -1 +1 @@
tests/qapi-schema/funny-char.json:2:36: Stray ';'
tests/qapi-schema/funny-char.json:2:36: stray ';'
2 changes: 1 addition & 1 deletion tests/qapi-schema/funny-word.err
@@ -1 +1 @@
tests/qapi-schema/funny-word.json:1:3: Stray 'command'
tests/qapi-schema/funny-word.json:1:3: stray 'command'
2 changes: 1 addition & 1 deletion tests/qapi-schema/ident-with-escape.err
@@ -1 +1 @@
tests/qapi-schema/ident-with-escape.json:3:3: Unknown escape \u
tests/qapi-schema/ident-with-escape.json:3:3: unknown escape \u
2 changes: 1 addition & 1 deletion tests/qapi-schema/include-before-err.err
@@ -1 +1 @@
tests/qapi-schema/include-before-err.json:2:13: Expected ':'
tests/qapi-schema/include-before-err.json:2:13: expected ':'
2 changes: 1 addition & 1 deletion tests/qapi-schema/include-cycle.err
@@ -1,3 +1,3 @@
In file included from tests/qapi-schema/include-cycle.json:1:
In file included from tests/qapi-schema/include-cycle-b.json:1:
tests/qapi-schema/include-cycle-c.json:1: Inclusion loop for include-cycle.json
tests/qapi-schema/include-cycle-c.json:1: inclusion loop for include-cycle.json
2 changes: 1 addition & 1 deletion tests/qapi-schema/include-extra-junk.err
@@ -1 +1 @@
tests/qapi-schema/include-extra-junk.json:3: Invalid 'include' directive
tests/qapi-schema/include-extra-junk.json:3: invalid 'include' directive
2 changes: 1 addition & 1 deletion tests/qapi-schema/include-nested-err.err
@@ -1,2 +1,2 @@
In file included from tests/qapi-schema/include-nested-err.json:1:
tests/qapi-schema/missing-colon.json:1:10: Expected ':'
tests/qapi-schema/missing-colon.json:1:10: expected ':'
2 changes: 1 addition & 1 deletion tests/qapi-schema/include-non-file.err
@@ -1 +1 @@
tests/qapi-schema/include-non-file.json:1: Value of 'include' must be a string
tests/qapi-schema/include-non-file.json:1: value of 'include' must be a string
2 changes: 1 addition & 1 deletion tests/qapi-schema/include-self-cycle.err
@@ -1 +1 @@
tests/qapi-schema/include-self-cycle.json:1: Inclusion loop for include-self-cycle.json
tests/qapi-schema/include-self-cycle.json:1: inclusion loop for include-self-cycle.json

0 comments on commit 2ab218a

Please sign in to comment.