From c194de0713ebe71aaeeb5ebed4af2390cc1b521c Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Thu, 11 Jul 2024 09:34:27 -0400 Subject: [PATCH] Change pg_regress.c back to using diff -w on Windows This partially reverts commit 628c1d1f2c. It appears that there are non line-end differences in some regression tests on Windows. To keep the buildfarm and CI clients happy, change this back for now, pending further investigation. Per reports from Tatsuo Ishii and Nazir Bilal Yavuz. --- src/test/regress/pg_regress.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 9ff0a2d65e..7e7ad25600 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -65,8 +65,8 @@ static char *shellprog = SHELLPROG; const char *basic_diff_opts = ""; const char *pretty_diff_opts = "-U3"; #else -const char *basic_diff_opts = "--strip-trailing-cr"; -const char *pretty_diff_opts = "--strip-trailing-cr -U3"; +const char *basic_diff_opts = "-w"; +const char *pretty_diff_opts = "-w -U3"; #endif /*