diff options
| -rw-r--r-- | src/test/perl/TestLib.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm index 8fd6f2c92a8..4927d45d59c 100644 --- a/src/test/perl/TestLib.pm +++ b/src/test/perl/TestLib.pm @@ -226,6 +226,7 @@ sub psql print("# Running SQL command: $sql\n"); run [ 'psql', '-X', '-A', '-t', '-q', '-d', $dbname, '-f', '-' ], '<', \$sql, '>', \$stdout, '2>', \$stderr or die; chomp $stdout; + $stdout =~ s/\r//g if $Config{osname} eq 'msys'; return $stdout; } @@ -242,7 +243,9 @@ sub slurp_file { local $/; local @ARGV = @_; - <> + my $contents = <>; + $contents =~ s/\r//g if $Config{osname} eq 'msys'; + return $contents; } sub system_or_bail |