Further tighten Windows CRLF conversion in our TAP test scripts.

tglsfdc · tglsfdc · commit ffb4cee43bdc · 2020-07-09T11:37:21.000-04:00
Buildfarm results now imply that Perl's IPC::Run does CRLF conversion for us if we're using native Perl, but not when using MSys Perl. Restrict the conversions done by PostgresNode.pm to act only in the latter case. (Similar conversions done in TestLib.pm and RewindTest.pm were already handled this way.) Discussion: https://postgr.es/m/412ae8da-76bb-640f-039a-f3513499e53d@gmx.net
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
@@ -1512,15 +1512,19 @@ 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 $TestLib::windows_os;
+		$$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 		chomp $$stdout;
 	}
 
 	if (defined $$stderr)
 	{
-		$$stderr =~ s/\r\n/\n/g if $TestLib::windows_os;
+		$$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 		chomp $$stderr;
 	}
 
@@ -1651,7 +1655,7 @@ sub poll_query_until
 	{
 		my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
 
-		$stdout =~ s/\r\n/\n/g if $TestLib::windows_os;
+		$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 		chomp($stdout);
 
 		if ($stdout eq $expected)
@@ -1667,7 +1671,7 @@ 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 $TestLib::windows_os;
+	$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 	chomp($stderr);
 	diag qq(poll_query_until timed out executing this query:
 $query
@@ -2112,8 +2116,8 @@ sub pg_recvlogical_upto
 		}
 	};
 
-	$stdout =~ s/\r\n/\n/g if $TestLib::windows_os;
-	$stderr =~ s/\r\n/\n/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)
 	{

Original file line number	Diff line number	Diff line change
`@@ -1512,15 +1512,19 @@ sub psql`
`1512`	`1512`	`}`
`1513`	`1513`	`};`
`1514`	`1514`
	`1515`	`+ # Note: on Windows, IPC::Run seems to convert \r\n to \n in program output`
	`1516`	`+ # if we're using native Perl, but not if we're using MSys Perl. So do it`
	`1517`	`+ # by hand in the latter case, here and elsewhere.`
	`1518`	`+`
`1515`	`1519`	`if (defined $$stdout)`
`1516`	`1520`	`{`
`1517`		`- $$stdout =~ s/\r\n/\n/g if $TestLib::windows_os;`
	`1521`	`+ $$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`1518`	`1522`	`chomp $$stdout;`
`1519`	`1523`	`}`
`1520`	`1524`
`1521`	`1525`	`if (defined $$stderr)`
`1522`	`1526`	`{`
`1523`		`- $$stderr =~ s/\r\n/\n/g if $TestLib::windows_os;`
	`1527`	`+ $$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`1524`	`1528`	`chomp $$stderr;`
`1525`	`1529`	`}`
`1526`	`1530`
`@@ -1651,7 +1655,7 @@ sub poll_query_until`
`1651`	`1655`	`{`
`1652`	`1656`	`my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;`
`1653`	`1657`
`1654`		`- $stdout =~ s/\r\n/\n/g if $TestLib::windows_os;`
	`1658`	`+ $stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`1655`	`1659`	`chomp($stdout);`
`1656`	`1660`
`1657`	`1661`	`if ($stdout eq $expected)`
`@@ -1667,7 +1671,7 @@ sub poll_query_until`
`1667`	`1671`
`1668`	`1672`	`# The query result didn't change in 180 seconds. Give up. Print the`
`1669`	`1673`	`# output from the last attempt, hopefully that's useful for debugging.`
`1670`		`- $stderr =~ s/\r\n/\n/g if $TestLib::windows_os;`
	`1674`	`+ $stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`1671`	`1675`	`chomp($stderr);`
`1672`	`1676`	`diag qq(poll_query_until timed out executing this query:`
`1673`	`1677`	`$query`
`@@ -2112,8 +2116,8 @@ sub pg_recvlogical_upto`
`2112`	`2116`	`}`
`2113`	`2117`	`};`
`2114`	`2118`
`2115`		`- $stdout =~ s/\r\n/\n/g if $TestLib::windows_os;`
`2116`		`- $stderr =~ s/\r\n/\n/g if $TestLib::windows_os;`
	`2119`	`+ $stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
	`2120`	`+ $stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';`
`2117`	`2121`
`2118`	`2122`	`if (wantarray)`
`2119`	`2123`	`{`