diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-02-20 12:43:35 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-02-24 14:19:35 +0100 |
| commit | 831dbc358eab0a50c1b435f93d7c16d99ad61472 (patch) | |
| tree | ccc4be9f80a8d4d982bff7bbcf53fa7ffa5597d3 /test | |
| parent | 89314d9a22ad0b0ce87e188c486532926aff01ea (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)
(cherry picked from commit d4c499f562c1ab7ec7773c3987fc4dce7662a805)
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/80-test_pkcs12.t | 2 |
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... |