pg.ddx.io pgsql-committers@postgresql.org mailing list archivehelp / color / mirror / Atom feed
pgsql: Use diff's --strip-trailing-cr flag where appropriate on Windows 2+ messages / 1 participants [nested] [flat]
* pgsql: Use diff's --strip-trailing-cr flag where appropriate on Windows @ 2024-07-10 14:02 Andrew Dunstan <andrew@dunslane.net> 0 siblings, 0 replies; 2+ messages in thread From: Andrew Dunstan @ 2024-07-10 14:02 UTC (permalink / raw) To: pgsql-committers@lists.postgresql.org 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(-) ^ permalink raw reply [nested|flat] 2+ messages in thread
* pgsql: Use diff's --strip-trailing-cr flag where appropriate on Windows @ 2024-07-10 14:05 Andrew Dunstan <andrew@dunslane.net> 0 siblings, 0 replies; 2+ messages in thread From: Andrew Dunstan @ 2024-07-10 14:05 UTC (permalink / raw) To: pgsql-committers@lists.postgresql.org 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 ------ REL_17_STABLE Details ------- https://git.postgresql.org/pg/commitdiff/4506d18a9891c70ce977047e2b4ffc05bef65165 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(-) ^ permalink raw reply [nested|flat] 2+ messages in thread
end of thread, other threads:[~2024-07-10 14:05 UTC | newest] Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2024-07-10 14:02 pgsql: Use diff's --strip-trailing-cr flag where appropriate on Windows Andrew Dunstan <andrew@dunslane.net> 2024-07-10 14:05 pgsql: Use diff's --strip-trailing-cr flag where appropriate on Windows Andrew Dunstan <andrew@dunslane.net>
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