diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-07-09 17:38:52 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-07-09 17:38:52 -0400 |
| commit | a3cfb10764bb4fb20d8d57afc9f02c8eca3f570d (patch) | |
| tree | 011f8a44ff2dec6bb649d3ea5078bcac3c80eea5 /src/test/perl/TestLib.pm | |
| parent | 2564e2d08546dfedc1482e10205be58a20ffe3cc (diff) | |
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
Diffstat (limited to 'src/test/perl/TestLib.pm')
| -rw-r--r-- | src/test/perl/TestLib.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm index 9006b5478bf..81e3252dcfb 100644 --- a/src/test/perl/TestLib.pm +++ b/src/test/perl/TestLib.pm @@ -260,7 +260,7 @@ sub slurp_file or die "could not read \"$filename\": $!"; my $contents = <$in>; close $in; - $contents =~ s/\r//g if $Config{osname} eq 'msys'; + $contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys'; return $contents; } |