Avoid some MinGW test failures

[thirdparty/openssl.git] / test / recipes / 25-test_x509.t

diff --git a/test/recipes/25-test_x509.t b/test/recipes/25-test_x509.t
index 7e8ce2408e919faa89e93615ac14f88277271262..81bd8f6f6e8a345f6e1d994d459721a408c240dd 100644 (file)
--- a/test/recipes/25-test_x509.t
+++ b/test/recipes/25-test_x509.t
@@ -18,6 +18,10 @@ setup("test_x509");
 
 plan tests => 18;
 
+# Prevent MSys2 filename munging for arguments that look like file paths but
+# aren't
+$ENV{MSYS2_ARG_CONV_EXCL} = "/CN=";
+
 require_ok(srctop_file("test", "recipes", "tconversion.pl"));
 
 my @certs = qw(test certs);
@@ -40,7 +44,7 @@ is(cmp_text($out_utf8, $utf),
 
 SKIP: {
     skip "DES disabled", 1 if disabled("des");
-    skip "VMS doesn't support command line UTF-8", 1 if $^O eq 'VMS';
+    skip "Platform doesn't support command line UTF-8", 1 if $^O =~ /^(VMS|msys)$/;
 
     my $p12 = srctop_file("test", "shibboleth.pfx");
     my $p12pass = "σύνθημα γνώρισμα";