postgres.git / summary / log / commit / refs

commit    c194de0713ebe71aaeeb5ebed4af2390cc1b521c
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Thu Jul 11 13:34:27 2024 +0000
First released in: 18.0

    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 9ff0a2d65e2..7e7ad256000 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
 
 /*


[parent: 9e4664d950c1]