From ae3ece03a61e8822fd7ea58f44812871efba82d1 Mon Sep 17 00:00:00 2001 From: Dmitry Belyavskiy Date: Fri, 29 Apr 2022 14:22:24 +0200 Subject: Improving locale test Fixes #18205 Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/18211) (cherry picked from commit 93983e555531a8d9bf70d12e4cfdb5ce2f337e3b) --- test/localetest.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/localetest.c b/test/localetest.c index 3db66b7a9e..ea80039b3b 100644 --- a/test/localetest.c +++ b/test/localetest.c @@ -91,12 +91,14 @@ int setup_tests(void) X509_PUBKEY *cert_pubkey = NULL; const unsigned char *p = der_bytes; - TEST_ptr(setlocale(LC_ALL, "")); + if (setlocale(LC_ALL, "") == NULL) + return TEST_skip("Cannot set the locale necessary for test"); res = strcasecmp(str1, str2); TEST_note("Case-insensitive comparison via strcasecmp in current locale %s\n", res ? "failed" : "succeeded"); - TEST_false(OPENSSL_strcasecmp(str1, str2)); + if (!TEST_false(OPENSSL_strcasecmp(str1, str2))) + return 0; cert = d2i_X509(NULL, &p, sizeof(der_bytes)); if (!TEST_ptr(cert)) -- cgit v1.2.3