postgres
diff --git a/‎src/bin/pg_rewind/t/RewindTest.pm
Copy file name to clipboardExpand all lines: src/bin/pg_rewind/t/RewindTest.pm
+1-1Lines changed: 1 addition & 1 deletion b/‎src/bin/pg_rewind/t/RewindTest.pm
Copy file name to clipboardExpand all lines: src/bin/pg_rewind/t/RewindTest.pm
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/test/perl/PostgresNode.pm
Copy file name to clipboardExpand all lines: src/test/perl/PostgresNode.pm
+8-5Lines changed: 8 additions & 5 deletions b/‎src/test/perl/PostgresNode.pm
Copy file name to clipboardExpand all lines: src/test/perl/PostgresNode.pm
+8-5Lines changed: 8 additions & 5 deletions
diff --git a/‎src/test/perl/TestLib.pm
Copy file name to clipboardExpand all lines: src/test/perl/TestLib.pm
+1-1Lines changed: 1 addition & 1 deletion b/‎src/test/perl/TestLib.pm
Copy file name to clipboardExpand all lines: src/test/perl/TestLib.pm
+1-1Lines changed: 1 addition & 1 deletion
@@ -107,7 +107,7 @@ sub check_query
 	}
 	else
 	{
-		$stdout =~ s/\r//g if $Config{osname} eq 'msys';
+		$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 		is($stdout, $expected_stdout, "$test_name: query result matches");
 	}
 }
 
@@ -1122,7 +1122,6 @@ sub safe_psql
 		print "\n#### End standard error\n";
 	}
 
-	$stdout =~ s/\r//g if $TestLib::windows_os;
 	return $stdout;
 }
 
@@ -1297,16 +1296,20 @@ sub psql
 		}
 	};
 
+	# Note: on Windows, IPC::Run seems to convert \r\n to \n in program output
+	# if we're using native Perl, but not if we're using MSys Perl.  So do it
+	# by hand in the latter case, here and elsewhere.
+
 	if (defined $$stdout)
 	{
+		$$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 		chomp $$stdout;
-		$$stdout =~ s/\r//g if $TestLib::windows_os;
 	}
 
 	if (defined $$stderr)
 	{
+		$$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 		chomp $$stderr;
-		$$stderr =~ s/\r//g if $TestLib::windows_os;
 	}
 
 	# See http://perldoc.perl.org/perlvar.html#%24CHILD_ERROR
@@ -1364,8 +1367,8 @@ sub poll_query_until
 		  [ 'psql', '-XAt', '-c', $query, '-d', $self->connstr($dbname) ];
 		my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
 
+		$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 		chomp($stdout);
-		$stdout =~ s/\r//g if $TestLib::windows_os;
 		if ($stdout eq "t")
 		{
 			return 1;
@@ -1378,8 +1381,8 @@ sub poll_query_until
 
 	# The query result didn't change in 180 seconds. Give up. Print the
 	# output from the last attempt, hopefully that's useful for debugging.
+	$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 	chomp($stderr);
-	$stderr =~ s/\r//g if $TestLib::windows_os;
 	diag qq(poll_query_until timed out executing this query:
 $query
 expecting this output:
 
@@ -216,7 +216,7 @@ sub slurp_file
 	  or die "could not read \"$filename\": $!";
 	my $contents = <$in>;
 	close $in;
-	$contents =~ s/\r//g if $Config{osname} eq 'msys';
+	$contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 	return $contents;
 }
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ sub check_query`
`107`	`107`	`}`
`108`	`108`	`else`
`109`	`109`	`{`
`110`		`- $stdout =~ s/\r//g if $Config{osname} eq 'msys';`
	`110`	`+ $stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`111`	`111`	`is($stdout, $expected_stdout, "$test_name: query result matches");`
`112`	`112`	`}`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ sub slurp_file`
`216`	`216`	`or die "could not read \"$filename\": $!";`
`217`	`217`	`my $contents = <$in>;`
`218`	`218`	`close $in;`
`219`		`- $contents =~ s/\r//g if $Config{osname} eq 'msys';`
	`219`	`+ $contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`220`	`220`	`return $contents;`
`221`	`221`	`}`
`222`	`222`