| Message ID | 20200905212603.761-1-luoyonggang@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | meson: Fixes qapi tests. | expand |
On 05/09/2020 23.26, Yonggang Luo wrote: > Use -b to ignore-space-change > > The error are: > +@end table > + > +@end deftypefn I'd maybe just say "Use -b to ignore CR vs. CR-LF issues on Windows" and omit the incomplete example (the diff in the test run that you linked in an older mail showed that the diff was about the whole file due to the different line endings). > make: *** [Makefile.mtest:63: check-qapi-schema] Error 1 > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > --- > tests/qapi-schema/meson.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build > index c87d141417..f1449298b0 100644 > --- a/tests/qapi-schema/meson.build > +++ b/tests/qapi-schema/meson.build > @@ -220,6 +220,6 @@ qapi_doc = custom_target('QAPI doc', > > # "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()], > +test('QAPI doc', diff, args: ['-b', '-u', files('doc-good.texi'), qapi_doc[0].full_path()], > depends: qapi_doc, > suite: ['qapi-schema', 'qapi-doc']) > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index c87d141417..f1449298b0 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -220,6 +220,6 @@ qapi_doc = custom_target('QAPI doc', # "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()], +test('QAPI doc', diff, args: ['-b', '-u', files('doc-good.texi'), qapi_doc[0].full_path()], depends: qapi_doc, suite: ['qapi-schema', 'qapi-doc'])
Use -b to ignore-space-change 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)