postgres.git / summary / log / commit / refs

commit    999dc1d2650883b817ea6d4e393ca8ba84a8687d
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Thu Jan 27 13:17:42 2022 +0000
First released in: 15.0, 14.2

    Improve msys2 detection for TAP tests
    
    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.


 src/test/perl/TestLib.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index e4c2a95ec77..e4dda0db9dc 100644
--- 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)
 	{


[parent: d1cca9441dc4]