On 9/7/20 12:48 PM, Yonggang Luo wrote:
Or the tests result would cause following test failure:
Running test QAPI doc
LINK tests/check-qdict.exe
---
C:/Users/ContainerAdministrator/AppData/Local/Temp/qemu-build/../cirrus-ci-build/tests/qapi-schema/doc-good.texi
2020-09-02 10:26:02.396028200 -0700
+++
C:/Users/ContainerAdministrator/AppData/Local/Temp/qemu-build/tests/qapi-schema/doc-good-qapi-doc.texi
2020-09-02 10:43:09.849568200 -0700
@@ -1,319 +1,319 @@
-@c AUTOMATICALLY GENERATED, DO NOT MODIFY
-
-
+@c AUTOMATICALLY GENERATED, DO NOT MODIFY
+@end deftypefn
+
make: *** [Makefile.mtest:85: check-qapi-doc] Error 1
make: *** Waiting for unfinished jobs....
Signed-off-by: Yonggang Luo <luoyongg...@gmail.com>
---
tests/qapi-schema/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Commit message is tooooo long compared to the body of the patch. I'd
suggest:
meson: Use -b to ignore CR vs. CR-LF issues on Windows
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.
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()],
The change itself is sensible, once the commit message is fixed, so for
v3, you can add:
Reviewed-by: Eric Blake <ebl...@redhat.com>
depends: qapi_doc,
suite: ['qapi-schema', 'qapi-doc'])
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
