Tighten up Windows CRLF conversion in our TAP test scripts.

tglsfdc · tglsfdc · commit a3cfb10764bb · 2020-07-09T17:38:52.000-04:00
Back-patch commits 91bdf49 and ffb4cee, so that all branches agree on when and how to do Windows CRLF conversion. This should close the referenced thread. Thanks to Andrew Dunstan for discussion/review. Discussion: https://postgr.es/m/412ae8da-76bb-640f-039a-f3513499e53d@gmx.net
diff --git a/src/bin/pg_rewind/t/RewindTest.pm b/src/bin/pg_rewind/t/RewindTest.pm
@@ -111,7 +111,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");
 	}
 	return;
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
@@ -1296,7 +1296,6 @@ sub safe_psql
 		print "\n#### End standard error\n";
 	}
 
-	$stdout =~ s/\r//g if $TestLib::windows_os;
 	return $stdout;
 }
 
@@ -1472,16 +1471,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
@@ -1544,8 +1547,8 @@ sub poll_query_until
 	{
 		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 $expected)
 		{
@@ -1560,8 +1563,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:
@@ -2005,8 +2008,8 @@ sub pg_recvlogical_upto
 		}
 	};
 
-	$stdout =~ s/\r//g if $TestLib::windows_os;
-	$stderr =~ s/\r//g if $TestLib::windows_os;
+	$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
+	$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 
 	if (wantarray)
 	{
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
@@ -260,7 +260,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
`@@ -111,7 +111,7 @@ sub check_query`
`111`	`111`	`}`
`112`	`112`	`else`
`113`	`113`	`{`
`114`		`- $stdout =~ s/\r//g if $Config{osname} eq 'msys';`
	`114`	`+ $stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`115`	`115`	`is($stdout, $expected_stdout, "$test_name: query result matches");`
`116`	`116`	`}`
`117`	`117`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -1296,7 +1296,6 @@ sub safe_psql`
`1296`	`1296`	`print "\n#### End standard error\n";`
`1297`	`1297`	`}`
`1298`	`1298`
`1299`		`- $stdout =~ s/\r//g if $TestLib::windows_os;`
`1300`	`1299`	`return $stdout;`
`1301`	`1300`	`}`
`1302`	`1301`
`@@ -1472,16 +1471,20 @@ sub psql`
`1472`	`1471`	`}`
`1473`	`1472`	`};`
`1474`	`1473`
	`1474`	`+ # Note: on Windows, IPC::Run seems to convert \r\n to \n in program output`
	`1475`	`+ # if we're using native Perl, but not if we're using MSys Perl. So do it`
	`1476`	`+ # by hand in the latter case, here and elsewhere.`
	`1477`	`+`
`1475`	`1478`	`if (defined $$stdout)`
`1476`	`1479`	`{`
	`1480`	`+ $$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`1477`	`1481`	`chomp $$stdout;`
`1478`		`- $$stdout =~ s/\r//g if $TestLib::windows_os;`
`1479`	`1482`	`}`
`1480`	`1483`
`1481`	`1484`	`if (defined $$stderr)`
`1482`	`1485`	`{`
	`1486`	`+ $$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`1483`	`1487`	`chomp $$stderr;`
`1484`		`- $$stderr =~ s/\r//g if $TestLib::windows_os;`
`1485`	`1488`	`}`
`1486`	`1489`
`1487`	`1490`	`# See http://perldoc.perl.org/perlvar.html#%24CHILD_ERROR`
`@@ -1544,8 +1547,8 @@ sub poll_query_until`
`1544`	`1547`	`{`
`1545`	`1548`	`my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;`
`1546`	`1549`
	`1550`	`+ $stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`1547`	`1551`	`chomp($stdout);`
`1548`		`- $stdout =~ s/\r//g if $TestLib::windows_os;`
`1549`	`1552`
`1550`	`1553`	`if ($stdout eq $expected)`
`1551`	`1554`	`{`
`@@ -1560,8 +1563,8 @@ sub poll_query_until`
`1560`	`1563`
`1561`	`1564`	`# The query result didn't change in 180 seconds. Give up. Print the`
`1562`	`1565`	`# output from the last attempt, hopefully that's useful for debugging.`
	`1566`	`+ $stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`1563`	`1567`	`chomp($stderr);`
`1564`		`- $stderr =~ s/\r//g if $TestLib::windows_os;`
`1565`	`1568`	`diag qq(poll_query_until timed out executing this query:`
`1566`	`1569`	`$query`
`1567`	`1570`	`expecting this output:`
`@@ -2005,8 +2008,8 @@ sub pg_recvlogical_upto`
`2005`	`2008`	`}`
`2006`	`2009`	`};`
`2007`	`2010`
`2008`		`- $stdout =~ s/\r//g if $TestLib::windows_os;`
`2009`		`- $stderr =~ s/\r//g if $TestLib::windows_os;`
	`2011`	`+ $stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
	`2012`	`+ $stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`2010`	`2013`
`2011`	`2014`	`if (wantarray)`
`2012`	`2015`	`{`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ sub slurp_file`
`260`	`260`	`or die "could not read \"$filename\": $!";`
`261`	`261`	`my $contents = <$in>;`
`262`	`262`	`close $in;`
`263`		`- $contents =~ s/\r//g if $Config{osname} eq 'msys';`
	`263`	`+ $contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`264`	`264`	`return $contents;`
`265`	`265`	`}`
`266`	`266`