From: Andrew Dunstan <andrew@dunslane.net>
Date: 2022年1月27日 13:17:42 +0000 (-0500)
Subject: Improve msys2 detection for TAP tests
X-Git-Tag: REL_15_BETA1~824
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=acea505186e65dff33db69517d36a02c7b4f0283;p=postgresql.git
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.
---
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' &#124;&#124; $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)
 	{
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://git.postgresql.org/gitweb/?a=commitdiff_plain&amp;h=acea505186e65dff33db69517d36a02c7b4f0283&amp;p=postgresql.git">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://git.postgresql.org/gitweb/?a=commitdiff_plain&amp;h=acea505186e65dff33db69517d36a02c7b4f0283&amp;p=postgresql.git" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>