aboutsummaryrefslogtreecommitdiff
path: root/tests/qapi-schema
diff options
context:
space:
mode:
authorYonggang Luo <luoyonggang@gmail.com>2020-09-15 20:13:02 +0800
committerThomas Huth <thuth@redhat.com>2020-09-16 08:41:06 +0200
commita84258e1f9702f1f6782bda06e97bf65632ccbb1 (patch)
treea15b3c1b16469796ee3438c9c0e636d467b9a02b /tests/qapi-schema
parent6333da0f0762ac02bac7dc2823f81ded8fceaaeb (diff)
downloadqemu-a84258e1f9702f1f6782bda06e97bf65632ccbb1.zip
qemu-a84258e1f9702f1f6782bda06e97bf65632ccbb1.tar.gz
qemu-a84258e1f9702f1f6782bda06e97bf65632ccbb1.tar.bz2
meson: Use -b to ignore CR vs. CR-LF issues on Windows
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 <luoyonggang@gmail.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20200915121318.247-11-luoyonggang@gmail.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/qapi-schema')
-rw-r--r--tests/qapi-schema/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index c87d141..f144929 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'])