From: | Andrew Dunstan <andrew(at)dunslane(dot)net> |
---|---|
To: | pgsql-committers(at)lists(dot)postgresql(dot)org |
Subject: | pgsql: Use diff's --strip-trailing-cr flag where appropriate on Windows |
Date: | 2024-07-10 14:02:59 |
Message-ID: | E1sRXuN-0017eo-LZ@gemulon.postgresql.org |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-committers |
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(-)
From | Date | Subject | |
---|---|---|---|
Next Message | Andrew Dunstan | 2024-07-10 14:05:15 | pgsql: Use diff's --strip-trailing-cr flag where appropriate on Windows |
Previous Message | Fujii Masao | 2024-07-10 07:01:05 | pgsql: doc: Update track_io_timing documentation to mention pg_stat_io. |