Change pg_regress.c back to using diff -w on Windows

adunstan · adunstan · commit c194de0713eb · 2024-07-11T09:34:27.000-04:00
This partially reverts commit 628c1d1. 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.
diff --git 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
 
 /*
