From: Andy Polyakov <appro@openssl.org>
Date: Tue, 20 Feb 2018 11:43:35 +0000 (+0100)
Subject: test/recipes/80-test_pkcs12.t: handle lack of Win32::API.
X-Git-Tag: OpenSSL_1_1_1-pre2~51
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d4c499f562c1ab7ec7773c3987fc4dce7662a805;p=oweals%2Fopenssl.git

test/recipes/80-test_pkcs12.t: handle lack of Win32::API.

So far check for availability of Win32::API served as implicit check
for $^O being MSWin32. Reportedly it's not safe assumption, and check
for MSWin32 has to be explicit.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5416)
---

diff --git a/test/recipes/80-test_pkcs12.t b/test/recipes/80-test_pkcs12.t
index 5bcfb695e0..aa307d2d75 100644
--- a/test/recipes/80-test_pkcs12.t
+++ b/test/recipes/80-test_pkcs12.t
@@ -41,6 +41,8 @@ if (eval { require Win32::API; 1; }) {
         SetConsoleOutputCP(1253);
         $pass = Encode::encode("cp1253",Encode::decode("utf-8",$pass));
     }
+} elsif ($^O eq "MSWin32") {
+    plan skip_all => "Win32::API unavailable";
 } else {
     # Running MinGW tests transparently under Wine apparently requires
     # UTF-8 locale...