summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-02-20 12:43:35 +0100
committerAndy Polyakov <appro@openssl.org>2018-02-21 10:17:44 +0100
commitd4c499f562c1ab7ec7773c3987fc4dce7662a805 (patch)
treecbac7ca5d987978fcc47f4a9c024a5acfabec9a0 /test
parent0e5c8d566029a995d1fa23cac0f828c39519d97f (diff)
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)
Diffstat (limited to 'test')
-rw-r--r--test/recipes/80-test_pkcs12.t2
1 files changed, 2 insertions, 0 deletions
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...