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 16ce9c5c7e346cd20a198dc7ad53e79d5a1769b8..3c8d75f4e0f1f945dfb9277913c3eb24422c3669 100644 (file)
--- 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
 {
     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)
 # endif
         (strcmp(file, OPENSSL_FILE) == 0 || strcmp(file, "(no file)") == 0)
         && (line == test_log_line || line == 0)