From d4c499f562c1ab7ec7773c3987fc4dce7662a805 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Tue, 20 Feb 2018 12:43:35 +0100 Subject: [PATCH] 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 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5416) --- test/recipes/80-test_pkcs12.t | 2 ++ 1 file changed, 2 insertions(+) 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... -- 2.25.1