aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2020-10-05 19:20:17 -0700
committerAndres Freund <andres@anarazel.de>2020-10-05 19:20:17 -0700
commit1df2b50dbebb72a75708c3cfbc21bcaa71993147 (patch)
tree809c30cf4aa5243208835adae5efafd74c92fb7a
parent32a9c0bdf493cf5fc029ab44a22384d547290eff (diff)
downloadpostgresql-1df2b50dbebb72a75708c3cfbc21bcaa71993147.tar.gz
postgresql-1df2b50dbebb72a75708c3cfbc21bcaa71993147.zip
Try to unbreak 021_row_visibility.pl on mingw.
Thanks to Andrew for proposing and testing this fix. It's possible that we should address this on a more fundamental basis, e.g. by configuring PerlIO to to CR/LF conversion for us, but this approach already exists in other places. And it's nice to unbreak the BF. Proposed-By: Andrew Dunstan <andrew.dunstan@2ndquadrant.com> Discussion: https://postgr.es/m/2355d1f0-0244-da9c-ef0c-7542b944e1ac@2ndQuadrant.com
-rw-r--r--src/test/recovery/t/021_row_visibility.pl4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/test/recovery/t/021_row_visibility.pl b/src/test/recovery/t/021_row_visibility.pl
index 95516b05d01..8a466e56e0f 100644
--- a/src/test/recovery/t/021_row_visibility.pl
+++ b/src/test/recovery/t/021_row_visibility.pl
@@ -6,6 +6,7 @@ use warnings;
use PostgresNode;
use TestLib;
use Test::More tests => 10;
+use Config;
# Initialize primary node
my $node_primary = get_new_node('primary');
@@ -167,6 +168,9 @@ sub send_query_and_wait
$$psql{run}->pump_nb();
while (1)
{
+ # See PostgresNode.pm's psql()
+ $$psql{stdout} =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
+
last if $$psql{stdout} =~ /$untl/;
if ($psql_timeout->is_expired)