[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/24] meson: Use -b to ignore CR vs. CR-LF issues on Windows
From: |
Thomas Huth |
Subject: |
[PULL 15/24] meson: Use -b to ignore CR vs. CR-LF issues on Windows |
Date: |
Wed, 16 Sep 2020 13:47:22 +0200 |
From: Yonggang Luo <luoyonggang@gmail.com>
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>
---
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'])
--
2.18.2
- [PULL 04/24] tests/socket-helpers: Treat EAI_NONAME as EADDRNOTAVAIL, (continued)
- [PULL 04/24] tests/socket-helpers: Treat EAI_NONAME as EADDRNOTAVAIL, Thomas Huth, 2020/09/16
- [PULL 06/24] qga/commands-win32: Fix problem with redundant protype declaration, Thomas Huth, 2020/09/16
- [PULL 05/24] Simplify the .gitignore file, Thomas Huth, 2020/09/16
- [PULL 08/24] tests: Convert g_free to g_autofree macro in test-logging.c, Thomas Huth, 2020/09/16
- [PULL 07/24] rcu: Implement drain_call_rcu, Thomas Huth, 2020/09/16
- [PULL 10/24] meson: Disable test-char on msys2/mingw for fixing tests stuck, Thomas Huth, 2020/09/16
- [PULL 09/24] rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full, Thomas Huth, 2020/09/16
- [PULL 11/24] meson: disable crypto tests are empty under win32, Thomas Huth, 2020/09/16
- [PULL 12/24] tests: Fixes test-replication.c on msys2/mingw., Thomas Huth, 2020/09/16
- [PULL 14/24] osdep: file locking functions are not available on Win32, Thomas Huth, 2020/09/16
- [PULL 15/24] meson: Use -b to ignore CR vs. CR-LF issues on Windows,
Thomas Huth <=
- [PULL 13/24] tests: test-replication disable /replication/secondary/* on msys2/mingw., Thomas Huth, 2020/09/16
- [PULL 16/24] meson: remove empty else and duplicated gio deps, Thomas Huth, 2020/09/16
- [PULL 17/24] vmstate: Fixes test-vmstate.c on msys2/mingw, Thomas Huth, 2020/09/16
- [PULL 19/24] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c, Thomas Huth, 2020/09/16
- [PULL 18/24] tests: Fixes test-io-channel-socket.c tests under msys2/mingw, Thomas Huth, 2020/09/16
- [PULL 20/24] tests: Fixes test-io-channel-file by mask only owner file state mask bits, Thomas Huth, 2020/09/16
- [PULL 22/24] tests: Fixes test-qdev-global-props.c, Thomas Huth, 2020/09/16
- [PULL 21/24] tests: fix test-util-sockets.c, Thomas Huth, 2020/09/16
- [PULL 23/24] ci: Enable msys2 ci in cirrus, Thomas Huth, 2020/09/16
- [PULL 24/24] cirrus: Building freebsd in a single shot, Thomas Huth, 2020/09/16