From: Shane Lontis <shane.lontis@oracle.com>
Date: Tue, 8 Oct 2019 07:56:09 +0000 (+1000)
Subject: Fix CMP test error on platforms which set OPENSSL_FUNC to '(unknown function)'
X-Git-Tag: openssl-3.0.0-alpha1~1194
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=18caaa2ec41246267fc3e59160dbc19301d988a1;p=oweals%2Fopenssl.git

Fix CMP test error on platforms which set OPENSSL_FUNC to '(unknown function)'

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10119)
---

diff --git a/test/cmp_ctx_test.c b/test/cmp_ctx_test.c
index 16ce9c5c7e..3c8d75f4e0 100644
--- a/test/cmp_ctx_test.c
+++ b/test/cmp_ctx_test.c
@@ -240,7 +240,8 @@ static int test_log_cb(const char *func, const char *file, int line,
 {
     test_log_cb_res =
 # ifndef PEDANTIC
-        strcmp(func, "execute_cmp_ctx_log_cb_test") == 0 &&
+        (strcmp(func, "execute_cmp_ctx_log_cb_test") == 0
+         || strcmp(func, "(unknown function)") == 0) &&
 # endif
         (strcmp(file, OPENSSL_FILE) == 0 || strcmp(file, "(no file)") == 0)
         && (line == test_log_line || line == 0)