qemu-block
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v5 09/11] meson: Fixes qapi tests.


From: Yonggang Luo
Subject: Re: [PATCH v5 09/11] meson: Fixes qapi tests.
Date: Mon, 7 Sep 2020 12:20:55 +0800



On Sat, Sep 5, 2020 at 4:42 PM Thomas Huth <thuth@redhat.com> wrote:
On 05/09/2020 08.23, Yonggang Luo wrote:
> 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 | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> 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
> @@ -220,6 +220,7 @@ 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: ['--strip-trailing-cr',
> +                              '-u', files('doc-good.texi'), qapi_doc[0].full_path()],

I just had a look at the POSIX man page of "diff", and it seems like
"'--strip-trailing-cr" is not a portable option :-( Thus this will
likely fail on the BSDs and Solaris-based systems.
I think it's maybe best if you replace it with "-b" instead.
updated 

 Thomas



--
         此致

罗勇刚
Yours
    sincerely,
Yonggang Luo

reply via email to

[Prev in Thread] Current Thread [Next in Thread]