From 2175c018843eb9dfb7abb1d0efa4730e9cc00d14 Mon Sep 17 00:00:00 2001 From: Bob Beck Date: Tue, 2 Sep 2025 10:07:08 -0600 Subject: [PATCH] Fix cmp_ctx_test.c to be less sensitive to line wrapping. Similar to the previous errtest.c fix this also is not broken by any reformatting today, but this change makes this follow the same pattern as the other things that test OPENSSL_LINE after the fact so we maintain the same paradigm everywhere. Reviewed-by: Neil Horman Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/29243) --- test/cmp_ctx_test.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/cmp_ctx_test.c b/test/cmp_ctx_test.c index ca9b1d6ce83..6124283497f 100644 --- a/test/cmp_ctx_test.c +++ b/test/cmp_ctx_test.c @@ -254,7 +254,8 @@ static int test_CTX_reqExtensions_have_SAN(void) return result; } -static int test_log_line; +static int test_log_line_start; +static int test_log_line_end; static int test_log_cb_res = 0; static int test_log_cb(const char *func, const char *file, int line, OSSL_CMP_severity level, const char *msg) @@ -266,7 +267,8 @@ static int test_log_cb(const char *func, const char *file, int line, #endif (TEST_str_eq(file, OPENSSL_FILE) || TEST_str_eq(file, "(no file)")) - && (TEST_int_eq(line, test_log_line) || TEST_int_eq(line, 0)) + && (TEST_int_eq(line, test_log_line_start) || TEST_int_eq(line, 0) + || TEST_int_eq(line, test_log_line_end)) && (TEST_int_eq(level, OSSL_CMP_LOG_INFO) || TEST_int_eq(level, -1)) && TEST_str_eq(msg, "ok"); return 1; @@ -295,14 +297,16 @@ static int execute_cmp_ctx_log_cb_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture) if (!TEST_true(OSSL_CMP_CTX_set_log_cb(ctx, test_log_cb))) { res = 0; } else { - test_log_line = OPENSSL_LINE + 1; + test_log_line_start = OPENSSL_LINE + 1; ossl_cmp_log2(INFO, ctx, "%s%c", "o", 'k'); + test_log_line_end = OPENSSL_LINE - 1; if (!TEST_int_eq(test_log_cb_res, 1)) res = 0; OSSL_CMP_CTX_set_log_verbosity(ctx, OSSL_CMP_LOG_ERR); test_log_cb_res = -1; /* callback should not be called at all */ - test_log_line = OPENSSL_LINE + 1; + test_log_line_start = OPENSSL_LINE + 1; ossl_cmp_log2(INFO, ctx, "%s%c", "o", 'k'); + test_log_line_end = OPENSSL_LINE - 1; if (!TEST_int_eq(test_log_cb_res, -1)) res = 0; } -- 2.47.3