On Sun, Jun 09, 2024 at 03:58:08AM +0200, Bruno Haible wrote:
> Summarizing the results from [2]:

>   - On Cygwin and mingw, there are many test failures, some of which
>     look like CR-LF / LF mismatches.
> 
> [2] https://github.com/gnu-texinfo/ci-check/actions/runs/9432971359

I was able to download some of the newer mingw logs from Github and
much of the failures are under tp/tests and look like the following:

-defxcond.texi:10: warning: missing name for @deffn
-defxcond.texi:13: warning: missing name for @deffnx
+defxcond.texi:10: warning: missing name for @deffn<CR>
+defxcond.texi:13: warning: missing name for @deffnx<CR>

where <CR> is a carriage return byte.

I don't know why this problem has never come up before for tp/tests.
It has come up previously for install-info:

https://lists.gnu.org/archive/html/bug-texinfo/2022-10/msg00204.html

From:   Eli Zaretskii
Subject:        Re: texinfo-6.8.90 pretest on mingw
Date:   Sun, 23 Oct 2022 12:58:34 +0300
> This could be due to Diff.  I have long ago replaced the MSYS Diff
> with the following shell script (and gladly forgot about this issue):
> 
>   #! /bin/sh
>   # diff --- like diff.exe but ignore trailing CR characters
>   /bin/real_diff --strip-trailing-cr $*
> 
> where 'real_diff' is the original Diff program, renamed.
> 
> So maybe the install-info test suite should do something similar.

For tp/tests under mingw the fix would appear to be to pass the
--strip-trailing-cr flag around these lines in tp/tests/run_parser_all.sh:

      if test "z$res_dir_used" != 'z' ; then
        diff $DIFF_A_OPTION $DIFF_U_OPTION -r "$res_dir_used" "${outdir}$dir" 
2>>$logfile > "$testdir/$diffs_dir/$diff_base.diff"
        dif_ret=$?

If nobody else has any suggestions I could come up with a patch to add
this flag in.  We could check for it in the top-level configure script
with the other diff options.


Reply via email to