From 17b87b3049fa7e3ddc68bf9daaffa3b01d7b8be2 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 9 Jul 2020 17:38:52 -0400 Subject: Tighten up Windows CRLF conversion in our TAP test scripts. Back-patch commits 91bdf499b and ffb4cee43, so that all branches agree on when and how to do Windows CRLF conversion. This should close the referenced thread. Thanks to Andrew Dunstan for discussion/review. Discussion: https://postgr.es/m/412ae8da-76bb-640f-039a-f3513499e53d@gmx.net --- src/test/perl/TestLib.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/perl/TestLib.pm') diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm index d579d5c177b..a7490d2ce79 100644 --- a/src/test/perl/TestLib.pm +++ b/src/test/perl/TestLib.pm @@ -430,7 +430,7 @@ sub slurp_file CloseHandle($fHandle) or die "could not close \"$filename\": $^E\n"; } - $contents =~ s/\r//g if $Config{osname} eq 'msys'; + $contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys'; return $contents; } -- cgit v1.2.3