postgres.git / summary / log / commit / refs

commit    acea505186e65dff33db69517d36a02c7b4f0283
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/PostgreSQL/Test/Utils.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/perl/PostgreSQL/Test/Utils.pm b/src/test/perl/PostgreSQL/Test/Utils.pm
index 3da04b3b6cc..57fcb240898 100644
--- a/src/test/perl/PostgreSQL/Test/Utils.pm
+++ b/src/test/perl/PostgreSQL/Test/Utils.pm
@@ -142,7 +142,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: fefce9ef987e]