1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-07 00:36:50 +03:00

More fixes to allow pg_rewind tests to run on Msys.

This commit is contained in:
Andrew Dunstan
2015-08-11 08:58:58 -04:00
parent 6fcd88511f
commit 15c3a1b45b
2 changed files with 5 additions and 2 deletions

View File

@ -40,6 +40,7 @@ use warnings;
use TestLib;
use Test::More;
use Config;
use File::Copy;
use File::Path qw(rmtree);
use IPC::Run qw(run start);
@ -119,6 +120,7 @@ sub check_query
}
else
{
$stdout =~ s/\r//g if $Config{osname} eq 'msys';
is($stdout, $expected_stdout, "$test_name: query result matches");
}
}
@ -138,6 +140,7 @@ sub poll_query_until
my $result = run $cmd, '>', \$stdout, '2>', \$stderr;
chomp($stdout);
$stdout =~ s/\r//g if $Config{osname} eq 'msys';
if ($stdout eq "t")
{
return 1;