From 8e1a15822bcec6a1fb591f2d0ec4ce618d178926 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 4 Oct 2019 11:12:04 +0100 Subject: [PATCH] Fix no-autoerrinit Don't run the test_CTX_print_errors test test in test_cmp_ctx if no-autoerrinit has been configured. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/10091) --- test/cmp_ctx_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cmp_ctx_test.c b/test/cmp_ctx_test.c index 3cc84deec6..16ce9c5c7e 100644 --- a/test/cmp_ctx_test.c +++ b/test/cmp_ctx_test.c @@ -109,7 +109,7 @@ static int test_CTX_reinit(void) return result; } -#ifndef OPENSSL_NO_ERR +#if !defined(OPENSSL_NO_ERR) && !defined(OPENSSL_NO_AUTOERRINIT) static int msg_total_size = 0; static int msg_total_size_log_cb(const char *func, const char *file, int line, @@ -790,7 +790,7 @@ int setup_tests(void) * with OSSL_CMP_severity OSSL_CMP_LOG_ERR/WARNING/DEBUG/INFO: */ ADD_TEST(test_cmp_ctx_log_cb); -#ifndef OPENSSL_NO_ERR +#if !defined(OPENSSL_NO_ERR) && !defined(OPENSSL_NO_AUTOERRINIT) /* also tests OSSL_CMP_CTX_set_log_cb(), OSSL_CMP_print_errors_cb(), ossl_cmp_add_error_txt(), and the macros ossl_cmp_add_error_data and ossl_cmp_add_error_line: -- 2.25.1