Improve msys2 detection for TAP tests

adunstan · adunstan · commit 999dc1d26508 · 2022-01-27T08:26:28.000-05:00
Perl instances on some msys toolchains (e.g. UCRT64) have their
configured osname set to 'MSWin32' rather than 'msys'.  The test for
the msys2 platform is adjusted accordingly.

Backpatch to release 14.
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
@@ -143,7 +143,8 @@ BEGIN
 	# Must be set early
 	$windows_os = $Config{osname} eq 'MSWin32' || $Config{osname} eq 'msys';
 	# Check if this environment is MSYS2.
-	$is_msys2 = $^O eq 'msys' && `uname -or` =~ /^[2-9].*Msys/;
+	$is_msys2 = $windows_os && -x '/usr/bin/uname'  &&
+	  `uname -or` =~ /^[2-9].*Msys/;
 
 	if ($windows_os)
 	{

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,8 @@ BEGIN`
`143`	`143`	`# Must be set early`
`144`	`144`	`$windows_os = $Config{osname} eq 'MSWin32' \|\| $Config{osname} eq 'msys';`
`145`	`145`	`# Check if this environment is MSYS2.`
`146`		- $is_msys2 = $^O eq 'msys' && `uname -or` =~ /^[2-9].*Msys/;
	`146`	`+ $is_msys2 = $windows_os && -x '/usr/bin/uname' &&`
	`147`	+ `uname -or` =~ /^[2-9].*Msys/;
`147`	`148`
`148`	`149`	`if ($windows_os)`
`149`	`150`	`{`