mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove carriage returns from certain tap test output under Msys

Browse Source 
These were causing spurious test failures.
This commit is contained in:
Andrew Dunstan 2015-08-05 16:19:23 -04:00
parent 2834855cb9
commit ff85fc8d0b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/perl/TestLib.pm
View File

@ -226,6 +226,7 @@ sub psql
print("# Running SQL command: $sql\n"); print("# Running SQL command: $sql\n");
run [ 'psql', '-X', '-A', '-t', '-q', '-d', $dbname, '-f', '-' ], '<', \$sql, '>', \$stdout, '2>', \$stderr or die; run [ 'psql', '-X', '-A', '-t', '-q', '-d', $dbname, '-f', '-' ], '<', \$sql, '>', \$stdout, '2>', \$stderr or die;
chomp $stdout; chomp $stdout;
$stdout =~ s/\r//g if $Config{osname} eq 'msys';
return $stdout; return $stdout;
} }
@ -242,7 +243,9 @@ sub slurp_file
{ {
local $/; local $/;
local @ARGV = @_; local @ARGV = @_;
<> my $contents = <>;
$contents =~ s/\r//g if $Config{osname} eq 'msys';
return $contents;
} }
sub system_or_bail sub system_or_bail