[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v5 09/11] meson: Fixes qapi tests.
From: |
Thomas Huth |
Subject: |
Re: [PATCH v5 09/11] meson: Fixes qapi tests. |
Date: |
Sat, 5 Sep 2020 10:42:22 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 |
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.
Thomas
- [PATCH v5 04/11] meson: upgrade meson for execute custom ninjatool under msys2 properly, (continued)
- [PATCH v5 04/11] meson: upgrade meson for execute custom ninjatool under msys2 properly, Yonggang Luo, 2020/09/05
- [PATCH v5 05/11] ci: Enable msys2 ci in cirrus, Yonggang Luo, 2020/09/05
- [PATCH v5 06/11] tests: Trying fixes test-replication.c on msys2., Yonggang Luo, 2020/09/05
- [PATCH v5 07/11] block: get file-win32.c handle locking option consistence with file-posix.c, Yonggang Luo, 2020/09/05
- [PATCH v5 08/11] osdep: These function are only available on Non-Win32 system., Yonggang Luo, 2020/09/05
- [PATCH v5 09/11] meson: Fixes qapi tests., Yonggang Luo, 2020/09/05
- Re: [PATCH v5 09/11] meson: Fixes qapi tests.,
Thomas Huth <=
- [PATCH v5 10/11] docker: Add win32/msys2/mingw64 docker, Yonggang Luo, 2020/09/05
- [PATCH v5 11/11] ci: Enable Github actions., Yonggang Luo, 2020/09/05