Re: [PATCH v3 10/12] meson: Fixes qapi tests.

[Paolo Bonzini <pbonzini@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 16757 bytes --]

Your patch is rewriting the whole file, I think there's a git option to fix
the line endings on commit.

Also the commit message should describe why it's failing. I can see you
added --strip-trailing-cr, but still it should be mentioned.

Paolo

Il gio 3 set 2020, 09:44 Yonggang Luo <luoyonggang@gmail.com> ha scritto:

> The error are:
> +@end table
> +
> +@end deftypefn
> +
> make: *** [Makefile.mtest:63: check-qapi-schema] Error 1
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  tests/qapi-schema/meson.build | 451 +++++++++++++++++-----------------
>  1 file changed, 226 insertions(+), 225 deletions(-)
>
> diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
> index c87d141417..67ba0a5ebd 100644
> --- a/tests/qapi-schema/meson.build
> +++ b/tests/qapi-schema/meson.build
> @@ -1,225 +1,226 @@
> -test_env = environment()
> -test_env.set('PYTHONPATH', meson.source_root() / 'scripts')
> -test_env.set('PYTHONIOENCODING', 'utf-8')
> -
> -schemas = [
> -  'alternate-any.json',
> -  'alternate-array.json',
> -  'alternate-base.json',
> -  'alternate-branch-if-invalid.json',
> -  'alternate-clash.json',
> -  'alternate-conflict-dict.json',
> -  'alternate-conflict-enum-bool.json',
> -  'alternate-conflict-enum-int.json',
> -  'alternate-conflict-string.json',
> -  'alternate-conflict-bool-string.json',
> -  'alternate-conflict-num-string.json',
> -  'alternate-empty.json',
> -  'alternate-invalid-dict.json',
> -  'alternate-nested.json',
> -  'alternate-unknown.json',
> -  'args-alternate.json',
> -  'args-any.json',
> -  'args-array-empty.json',
> -  'args-array-unknown.json',
> -  'args-bad-boxed.json',
> -  'args-boxed-anon.json',
> -  'args-boxed-string.json',
> -  'args-int.json',
> -  'args-invalid.json',
> -  'args-member-array-bad.json',
> -  'args-member-case.json',
> -  'args-member-unknown.json',
> -  'args-name-clash.json',
> -  'args-union.json',
> -  'args-unknown.json',
> -  'bad-base.json',
> -  'bad-data.json',
> -  'bad-ident.json',
> -  'bad-if.json',
> -  'bad-if-empty.json',
> -  'bad-if-empty-list.json',
> -  'bad-if-list.json',
> -  'bad-type-bool.json',
> -  'bad-type-dict.json',
> -  'bad-type-int.json',
> -  'base-cycle-direct.json',
> -  'base-cycle-indirect.json',
> -  'command-int.json',
> -  'comments.json',
> -  'doc-bad-alternate-member.json',
> -  'doc-bad-boxed-command-arg.json',
> -  'doc-bad-command-arg.json',
> -  'doc-bad-enum-member.json',
> -  'doc-bad-event-arg.json',
> -  'doc-bad-feature.json',
> -  'doc-bad-section.json',
> -  'doc-bad-symbol.json',
> -  'doc-bad-union-member.json',
> -  'doc-before-include.json',
> -  'doc-before-pragma.json',
> -  'doc-duplicated-arg.json',
> -  'doc-duplicated-return.json',
> -  'doc-duplicated-since.json',
> -  'doc-empty-arg.json',
> -  'doc-empty-section.json',
> -  'doc-empty-symbol.json',
> -  'doc-good.json',
> -  'doc-interleaved-section.json',
> -  'doc-invalid-end.json',
> -  'doc-invalid-end2.json',
> -  'doc-invalid-return.json',
> -  'doc-invalid-section.json',
> -  'doc-invalid-start.json',
> -  'doc-missing-colon.json',
> -  'doc-missing-expr.json',
> -  'doc-missing-space.json',
> -  'doc-missing.json',
> -  'doc-no-symbol.json',
> -  'doc-undoc-feature.json',
> -  'double-type.json',
> -  'duplicate-key.json',
> -  'empty.json',
> -  'enum-bad-member.json',
> -  'enum-bad-name.json',
> -  'enum-bad-prefix.json',
> -  'enum-clash-member.json',
> -  'enum-dict-member-unknown.json',
> -  'enum-if-invalid.json',
> -  'enum-int-member.json',
> -  'enum-member-case.json',
> -  'enum-missing-data.json',
> -  'enum-wrong-data.json',
> -  'event-boxed-empty.json',
> -  'event-case.json',
> -  'event-member-invalid-dict.json',
> -  'event-nest-struct.json',
> -  'features-bad-type.json',
> -  'features-deprecated-type.json',
> -  'features-duplicate-name.json',
> -  'features-if-invalid.json',
> -  'features-missing-name.json',
> -  'features-name-bad-type.json',
> -  'features-no-list.json',
> -  'features-unknown-key.json',
> -  'flat-union-array-branch.json',
> -  'flat-union-bad-base.json',
> -  'flat-union-bad-discriminator.json',
> -  'flat-union-base-any.json',
> -  'flat-union-base-union.json',
> -  'flat-union-clash-member.json',
> -  'flat-union-discriminator-bad-name.json',
> -  'flat-union-empty.json',
> -  'flat-union-inline.json',
> -  'flat-union-inline-invalid-dict.json',
> -  'flat-union-int-branch.json',
> -  'flat-union-invalid-branch-key.json',
> -  'flat-union-invalid-discriminator.json',
> -  'flat-union-invalid-if-discriminator.json',
> -  'flat-union-no-base.json',
> -  'flat-union-optional-discriminator.json',
> -  'flat-union-string-discriminator.json',
> -  'funny-char.json',
> -  'funny-word.json',
> -  'ident-with-escape.json',
> -  'include-before-err.json',
> -  'include-cycle.json',
> -  'include-extra-junk.json',
> -  'include-nested-err.json',
> -  'include-no-file.json',
> -  'include-non-file.json',
> -  'include-repetition.json',
> -  'include-self-cycle.json',
> -  'include-simple.json',
> -  'indented-expr.json',
> -  'leading-comma-list.json',
> -  'leading-comma-object.json',
> -  'missing-colon.json',
> -  'missing-comma-list.json',
> -  'missing-comma-object.json',
> -  'missing-type.json',
> -  'nested-struct-data.json',
> -  'nested-struct-data-invalid-dict.json',
> -  'non-objects.json',
> -  'oob-test.json',
> -  'allow-preconfig-test.json',
> -  'pragma-doc-required-crap.json',
> -  'pragma-extra-junk.json',
> -  'pragma-name-case-whitelist-crap.json',
> -  'pragma-non-dict.json',
> -  'pragma-unknown.json',
> -  'pragma-returns-whitelist-crap.json',
> -  'qapi-schema-test.json',
> -  'quoted-structural-chars.json',
> -  'redefined-builtin.json',
> -  'redefined-command.json',
> -  'redefined-event.json',
> -  'redefined-type.json',
> -  'reserved-command-q.json',
> -  'reserved-enum-q.json',
> -  'reserved-member-has.json',
> -  'reserved-member-q.json',
> -  'reserved-member-u.json',
> -  'reserved-member-underscore.json',
> -  'reserved-type-kind.json',
> -  'reserved-type-list.json',
> -  'returns-alternate.json',
> -  'returns-array-bad.json',
> -  'returns-dict.json',
> -  'returns-unknown.json',
> -  'returns-whitelist.json',
> -  'string-code-point-31.json',
> -  'string-code-point-127.json',
> -  'struct-base-clash-deep.json',
> -  'struct-base-clash.json',
> -  'struct-data-invalid.json',
> -  'struct-member-if-invalid.json',
> -  'struct-member-invalid-dict.json',
> -  'struct-member-invalid.json',
> -  'trailing-comma-list.json',
> -  'trailing-comma-object.json',
> -  'type-bypass-bad-gen.json',
> -  'unclosed-list.json',
> -  'unclosed-object.json',
> -  'unclosed-string.json',
> -  'union-base-empty.json',
> -  'union-base-no-discriminator.json',
> -  'union-branch-case.json',
> -  'union-branch-if-invalid.json',
> -  'union-branch-invalid-dict.json',
> -  'union-clash-branches.json',
> -  'union-empty.json',
> -  'union-invalid-base.json',
> -  'union-optional-branch.json',
> -  'union-unknown.json',
> -  'unknown-escape.json',
> -  'unknown-expr-key.json',
> -]
> -
> -# Because people may want to use test-qapi.py from the command line, we
> -# are not using the "#! /usr/bin/env python3" trick here.  See
> -# docs/devel/build-system.txt
> -test('QAPI schema regression tests', python, args: files('test-qapi.py',
> schemas),
> -     env: test_env, suite: ['qapi-schema', 'qapi-frontend'])
> -
> -diff = find_program('diff')
> -
> -qapi_doc = custom_target('QAPI doc',
> -                         output: ['doc-good-qapi-doc.texi',
> -                                  'doc-good-qapi-commands.c',
> 'doc-good-qapi-commands.h',
> -                                  'doc-good-qapi-emit-events.c',
> 'doc-good-qapi-emit-events.h',
> -                                  'doc-good-qapi-events.c',
> 'doc-good-qapi-events.h',
> -                                  'doc-good-qapi-init-commands.c',
> 'doc-good-qapi-init-commands.h',
> -                                  'doc-good-qapi-introspect.c',
> 'doc-good-qapi-introspect.h',
> -                                  'doc-good-qapi-types.c',
> 'doc-good-qapi-types.h',
> -                                  'doc-good-qapi-visit.c',
> 'doc-good-qapi-visit.h' ],
> -                         input: files('doc-good.json'),
> -                         command: [ qapi_gen, '-o',
> meson.current_build_dir(),
> -                                    '-p', 'doc-good-', '@INPUT0@' ],
> -                         depend_files: qapi_gen_depends)
> -
> -# "full_path()" needed here to work around
> -# https://github.com/mesonbuild/meson/issues/7585
> -test('QAPI doc', diff, args: ['-u', files('doc-good.texi'),
> qapi_doc[0].full_path()],
> -     depends: qapi_doc,
> -     suite: ['qapi-schema', 'qapi-doc'])
> +test_env = environment()
> +test_env.set('PYTHONPATH', meson.source_root() / 'scripts')
> +test_env.set('PYTHONIOENCODING', 'utf-8')
> +
> +schemas = [
> +  'alternate-any.json',
> +  'alternate-array.json',
> +  'alternate-base.json',
> +  'alternate-branch-if-invalid.json',
> +  'alternate-clash.json',
> +  'alternate-conflict-dict.json',
> +  'alternate-conflict-enum-bool.json',
> +  'alternate-conflict-enum-int.json',
> +  'alternate-conflict-string.json',
> +  'alternate-conflict-bool-string.json',
> +  'alternate-conflict-num-string.json',
> +  'alternate-empty.json',
> +  'alternate-invalid-dict.json',
> +  'alternate-nested.json',
> +  'alternate-unknown.json',
> +  'args-alternate.json',
> +  'args-any.json',
> +  'args-array-empty.json',
> +  'args-array-unknown.json',
> +  'args-bad-boxed.json',
> +  'args-boxed-anon.json',
> +  'args-boxed-string.json',
> +  'args-int.json',
> +  'args-invalid.json',
> +  'args-member-array-bad.json',
> +  'args-member-case.json',
> +  'args-member-unknown.json',
> +  'args-name-clash.json',
> +  'args-union.json',
> +  'args-unknown.json',
> +  'bad-base.json',
> +  'bad-data.json',
> +  'bad-ident.json',
> +  'bad-if.json',
> +  'bad-if-empty.json',
> +  'bad-if-empty-list.json',
> +  'bad-if-list.json',
> +  'bad-type-bool.json',
> +  'bad-type-dict.json',
> +  'bad-type-int.json',
> +  'base-cycle-direct.json',
> +  'base-cycle-indirect.json',
> +  'command-int.json',
> +  'comments.json',
> +  'doc-bad-alternate-member.json',
> +  'doc-bad-boxed-command-arg.json',
> +  'doc-bad-command-arg.json',
> +  'doc-bad-enum-member.json',
> +  'doc-bad-event-arg.json',
> +  'doc-bad-feature.json',
> +  'doc-bad-section.json',
> +  'doc-bad-symbol.json',
> +  'doc-bad-union-member.json',
> +  'doc-before-include.json',
> +  'doc-before-pragma.json',
> +  'doc-duplicated-arg.json',
> +  'doc-duplicated-return.json',
> +  'doc-duplicated-since.json',
> +  'doc-empty-arg.json',
> +  'doc-empty-section.json',
> +  'doc-empty-symbol.json',
> +  'doc-good.json',
> +  'doc-interleaved-section.json',
> +  'doc-invalid-end.json',
> +  'doc-invalid-end2.json',
> +  'doc-invalid-return.json',
> +  'doc-invalid-section.json',
> +  'doc-invalid-start.json',
> +  'doc-missing-colon.json',
> +  'doc-missing-expr.json',
> +  'doc-missing-space.json',
> +  'doc-missing.json',
> +  'doc-no-symbol.json',
> +  'doc-undoc-feature.json',
> +  'double-type.json',
> +  'duplicate-key.json',
> +  'empty.json',
> +  'enum-bad-member.json',
> +  'enum-bad-name.json',
> +  'enum-bad-prefix.json',
> +  'enum-clash-member.json',
> +  'enum-dict-member-unknown.json',
> +  'enum-if-invalid.json',
> +  'enum-int-member.json',
> +  'enum-member-case.json',
> +  'enum-missing-data.json',
> +  'enum-wrong-data.json',
> +  'event-boxed-empty.json',
> +  'event-case.json',
> +  'event-member-invalid-dict.json',
> +  'event-nest-struct.json',
> +  'features-bad-type.json',
> +  'features-deprecated-type.json',
> +  'features-duplicate-name.json',
> +  'features-if-invalid.json',
> +  'features-missing-name.json',
> +  'features-name-bad-type.json',
> +  'features-no-list.json',
> +  'features-unknown-key.json',
> +  'flat-union-array-branch.json',
> +  'flat-union-bad-base.json',
> +  'flat-union-bad-discriminator.json',
> +  'flat-union-base-any.json',
> +  'flat-union-base-union.json',
> +  'flat-union-clash-member.json',
> +  'flat-union-discriminator-bad-name.json',
> +  'flat-union-empty.json',
> +  'flat-union-inline.json',
> +  'flat-union-inline-invalid-dict.json',
> +  'flat-union-int-branch.json',
> +  'flat-union-invalid-branch-key.json',
> +  'flat-union-invalid-discriminator.json',
> +  'flat-union-invalid-if-discriminator.json',
> +  'flat-union-no-base.json',
> +  'flat-union-optional-discriminator.json',
> +  'flat-union-string-discriminator.json',
> +  'funny-char.json',
> +  'funny-word.json',
> +  'ident-with-escape.json',
> +  'include-before-err.json',
> +  'include-cycle.json',
> +  'include-extra-junk.json',
> +  'include-nested-err.json',
> +  'include-no-file.json',
> +  'include-non-file.json',
> +  'include-repetition.json',
> +  'include-self-cycle.json',
> +  'include-simple.json',
> +  'indented-expr.json',
> +  'leading-comma-list.json',
> +  'leading-comma-object.json',
> +  'missing-colon.json',
> +  'missing-comma-list.json',
> +  'missing-comma-object.json',
> +  'missing-type.json',
> +  'nested-struct-data.json',
> +  'nested-struct-data-invalid-dict.json',
> +  'non-objects.json',
> +  'oob-test.json',
> +  'allow-preconfig-test.json',
> +  'pragma-doc-required-crap.json',
> +  'pragma-extra-junk.json',
> +  'pragma-name-case-whitelist-crap.json',
> +  'pragma-non-dict.json',
> +  'pragma-unknown.json',
> +  'pragma-returns-whitelist-crap.json',
> +  'qapi-schema-test.json',
> +  'quoted-structural-chars.json',
> +  'redefined-builtin.json',
> +  'redefined-command.json',
> +  'redefined-event.json',
> +  'redefined-type.json',
> +  'reserved-command-q.json',
> +  'reserved-enum-q.json',
> +  'reserved-member-has.json',
> +  'reserved-member-q.json',
> +  'reserved-member-u.json',
> +  'reserved-member-underscore.json',
> +  'reserved-type-kind.json',
> +  'reserved-type-list.json',
> +  'returns-alternate.json',
> +  'returns-array-bad.json',
> +  'returns-dict.json',
> +  'returns-unknown.json',
> +  'returns-whitelist.json',
> +  'string-code-point-31.json',
> +  'string-code-point-127.json',
> +  'struct-base-clash-deep.json',
> +  'struct-base-clash.json',
> +  'struct-data-invalid.json',
> +  'struct-member-if-invalid.json',
> +  'struct-member-invalid-dict.json',
> +  'struct-member-invalid.json',
> +  'trailing-comma-list.json',
> +  'trailing-comma-object.json',
> +  'type-bypass-bad-gen.json',
> +  'unclosed-list.json',
> +  'unclosed-object.json',
> +  'unclosed-string.json',
> +  'union-base-empty.json',
> +  'union-base-no-discriminator.json',
> +  'union-branch-case.json',
> +  'union-branch-if-invalid.json',
> +  'union-branch-invalid-dict.json',
> +  'union-clash-branches.json',
> +  'union-empty.json',
> +  'union-invalid-base.json',
> +  'union-optional-branch.json',
> +  'union-unknown.json',
> +  'unknown-escape.json',
> +  'unknown-expr-key.json',
> +]
> +
> +# Because people may want to use test-qapi.py from the command line, we
> +# are not using the "#! /usr/bin/env python3" trick here.  See
> +# docs/devel/build-system.txt
> +test('QAPI schema regression tests', python, args: files('test-qapi.py',
> schemas),
> +     env: test_env, suite: ['qapi-schema', 'qapi-frontend'])
> +
> +diff = find_program('diff')
> +
> +qapi_doc = custom_target('QAPI doc',
> +                         output: ['doc-good-qapi-doc.texi',
> +                                  'doc-good-qapi-commands.c',
> 'doc-good-qapi-commands.h',
> +                                  'doc-good-qapi-emit-events.c',
> 'doc-good-qapi-emit-events.h',
> +                                  'doc-good-qapi-events.c',
> 'doc-good-qapi-events.h',
> +                                  'doc-good-qapi-init-commands.c',
> 'doc-good-qapi-init-commands.h',
> +                                  'doc-good-qapi-introspect.c',
> 'doc-good-qapi-introspect.h',
> +                                  'doc-good-qapi-types.c',
> 'doc-good-qapi-types.h',
> +                                  'doc-good-qapi-visit.c',
> 'doc-good-qapi-visit.h' ],
> +                         input: files('doc-good.json'),
> +                         command: [ qapi_gen, '-o',
> meson.current_build_dir(),
> +                                    '-p', 'doc-good-', '@INPUT0@' ],
> +                         depend_files: qapi_gen_depends)
> +
> +# "full_path()" needed here to work around
> +# https://github.com/mesonbuild/meson/issues/7585
> +test('QAPI doc', diff, args: ['--strip-trailing-cr',
> +                              '-u', files('doc-good.texi'),
> qapi_doc[0].full_path()],
> +     depends: qapi_doc,
> +     suite: ['qapi-schema', 'qapi-doc'])
> --
> 2.28.0.windows.1
>
>

[-- Attachment #2: Type: text/html, Size: 23276 bytes --]