On 9/23/19 6:55 AM, Markus Armbruster wrote: >>> +++ b/tests/qapi-schema/union-branch-if-invalid.json >>> @@ -0,0 +1,7 @@ >>> +# Cover branch with invalid 'if' >>> +# FIXME not rejected, would generate '#if \n' >>> +{ 'enum': 'Branches', 'data': ['branch1'] } >>> +{ 'struct': 'Stru', 'data': { 'member': 'str' } } >>> +{ 'union': 'Uni', >>> + 'base': { 'tag': 'Branches' }, 'discriminator': 'tag', >>> + 'data': { 'branch1': { 'type': 'Stru', 'if': [''] } } } >> >> So you're pointing out a difference between an empty string and a string >> not containing a C macro name (possibly because later patches will give >> them different error messages). > > Not sure I got this comment.
I was comparing: > +++ b/tests/qapi-schema/union-branch-if-invalid.json > + 'data': { 'branch1': { 'type': 'Stru', 'if': [''] } } } with: > +++ b/tests/qapi-schema/alternate-branch-if-invalid.json > + 'data': { 'branch': { 'type': 'int', 'if': ' ' } } } Both of which produce invalid expansions, but because of the difference between empty string vs. all-whitespace might be fixed differently in later patches. At any rate, nothing to change in those tests. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature