Horton

Re: tests fail on windows with default git settings

Andrew Dunstan <andrew@dunslane.net>

View thread View on postgr.es
From: Andrew Dunstan <andrew@dunslane.net>
To: Dave Page <dpage@pgadmin.org>, Andres Freund <andres@anarazel.de>
Cc: Tom Lane <tgl@sss.pgh.pa.us>, pgsql-hackers@postgresql.org
Date: 2024-07-09T15:34:24Z
Lists: pgsql-hackers 
On 2024-07-09 Tu 9:52 AM, Dave Page wrote:
>
>
>     > What I suggest (see attached) is we run the diff command with
>     > --strip-trailing-cr on Windows. Then we just won't care if the
>     expected file
>     > and/or the output file has CRs.
>
>     I was wondering about that too, but I wasn't sure we can rely on
>     that flag
>     being supported...
>
>
> I have 4 different diff.exe's on my ~6 week old build VM (not counting 
> shims), all of which seem to support --strip-trailing-cr. Those builds 
> came with:
>
> - git
> - VC++
> - diffutils (installed by chocolatey)
> - vcpkg
>
> I think it's reasonable to assume it'll be supported.
>

Ok, cool. So I propose to patch the test_json_parser and pg_bsd_indent 
tests to use it on Windows, later today unless there's some objection.


cheers


andrew

--
Andrew Dunstan
EDB:https://www.enterprisedb.com

Commits

  1. Use diff --strip-trailing-cr in pg_regress.c

  2. Use diff's --strip-trailing-cr flag where appropriate on Windows