On 9/13/20 6:01 PM, 罗勇刚(Yonggang Luo) wrote: > > > On Sun, Sep 13, 2020 at 11:35 PM Philippe Mathieu-Daudé > <phi...@redhat.com <mailto:phi...@redhat.com>> wrote: > > On 9/13/20 12:44 AM, Yonggang Luo wrote: > > On windows, a difference in line endings causes testsuite failures > > complaining that every single line in files such as > > 'tests/qapi-schemadoc-good.texi' is wrong. Fix it by adding -b to > diff. > > Isn't '--strip-trailing-cr' more adapted? > > er, I did that before.....
So, yes/no? We can not follow all patches, so better if you add a note about your changes, either in the patch description if you think it's worthwhile keeping that information in the git history, else below the '---' separator, so that information is stripped from the patch when applying. Looking at the archive I see Thomas said this option is not POSIX thus not portable. What about adding this? "Ideally we would use the '--strip-trailing-cr' option, but not being POSIX is a portability problem (i.e. BSDs and Solaris based OSes). Instead use the '-b' option which, although doing slightly more, produce the expected result on Windows." > > > > > Signed-off-by: Yonggang Luo <luoyongg...@gmail.com > <mailto:luoyongg...@gmail.com>> > > Reviewed-by: Eric Blake <ebl...@redhat.com <mailto:ebl...@redhat.com>> > > Reviewed-by: Daniel P. Berrangé <berra...@redhat.com > <mailto:berra...@redhat.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']) > > > > > > -- > 此致 > 礼 > 罗勇刚 > Yours > sincerely, > Yonggang Luo
