From: Andrew Dunstan <andrew@dunslane.net>
To: pgsql-committers@lists.postgresql.org
Subject: pgsql: Use diff's --strip-trailing-cr flag where appropriate on Windows
Date: Wed, 10 Jul 2024 14:02:59 +0000
Message-ID: <E1sRXuN-0017eo-LZ@gemulon.postgresql.org> (raw)
Use diff's --strip-trailing-cr flag where appropriate on Windows
Test result files might be checked out using Unix or Windows style line
endings, depening on git flags, so on Windows we use the
--strip-trailing-cr flag to tell diff to ignore line endings
differences.
The flag is added to the diff invocation for the test_json_parser module
tests and the pg_bsd_indent tests. in pg_regress.c we replace the
current use of the "-w" flag, which ignore all white space differences,
with this one which only ignores line end differences.
Discussion: https://postgr.es/m/20240707052030.r77hbdkid3mwksop@awork3.anarazel.de
Branch
------
master
Details
-------
https://git.postgresql.org/pg/commitdiff/628c1d1f2c82f1983e5248b5dfe53170dc23d90a
Modified Files
--------------
src/test/modules/test_json_parser/t/003_test_semantic.pl | 4 +++-
src/test/regress/pg_regress.c | 4 ++--
src/tools/pg_bsd_indent/t/001_pg_bsd_indent.pl | 6 +++++-
3 files changed, 10 insertions(+), 4 deletions(-)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-committers@postgresql.org
Cc: andrew@dunslane.net, pgsql-committers@lists.postgresql.org
Subject: Re: pgsql: Use diff's --strip-trailing-cr flag where appropriate on Windows
In-Reply-To: <E1sRXuN-0017eo-LZ@gemulon.postgresql.org>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox