diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2015-08-11 08:58:58 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2015-08-11 08:58:58 -0400 |
| commit | 15c3a1b45b480f6478555e9ddbc6093bd031d12c (patch) | |
| tree | 5060b5ee2e7587c434ff9c2dbb55410295116f6e /src/bin/pg_rewind/RewindTest.pm | |
| parent | 6fcd88511f8e69e38defb1272e0042ef4bab2feb (diff) | |
| download | postgresql-15c3a1b45b480f6478555e9ddbc6093bd031d12c.tar.gz postgresql-15c3a1b45b480f6478555e9ddbc6093bd031d12c.zip | |
More fixes to allow pg_rewind tests to run on Msys.
Diffstat (limited to 'src/bin/pg_rewind/RewindTest.pm')
| -rw-r--r-- | src/bin/pg_rewind/RewindTest.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bin/pg_rewind/RewindTest.pm b/src/bin/pg_rewind/RewindTest.pm index fa6d24b0337..22e5cae45da 100644 --- a/src/bin/pg_rewind/RewindTest.pm +++ b/src/bin/pg_rewind/RewindTest.pm @@ -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; |