From: Tomas Mraz <tomas@openssl.org>
Date: Wed, 11 Oct 2023 10:55:41 +0000 (+0200)
Subject: trace_api_test.c: Separate tracing statements
X-Git-Tag: openssl-3.2.0-beta1~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0496d2dc35b6165873ce4fe4ffbef2458bdd8a0f;p=thirdparty%2Fopenssl.git

trace_api_test.c: Separate tracing statements

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22347)
---

diff --git a/test/trace_api_test.c b/test/trace_api_test.c
index e12750f06a7..f4f7ab42d46 100644
--- a/test/trace_api_test.c
+++ b/test/trace_api_test.c
@@ -84,14 +84,14 @@ static int put_trace_output(void)
     int res = 1;
 
     OSSL_TRACE_BEGIN(HTTP) {
-        res = TEST_int_eq(BIO_printf(trc_out, OSSL_HELLO), strlen(OSSL_HELLO))
-            + TEST_int_eq(trace_string(0, 0, OSSL_STR80), strlen(OSSL_STR80))
-            + TEST_int_eq(trace_string(0, 0, OSSL_STR81), strlen(OSSL_STR80))
-            + TEST_int_eq(trace_string(1, 1, OSSL_CTRL), strlen(OSSL_CTRL))
-            + TEST_int_eq(trace_string(0, 1, OSSL_MASKED), strlen(OSSL_MASKED)
-                          + 1) /* newline added */
-            + TEST_int_eq(BIO_printf(trc_out, OSSL_BYE), strlen(OSSL_BYE))
-            == 6;
+        res = TEST_int_eq(BIO_printf(trc_out, OSSL_HELLO), strlen(OSSL_HELLO));
+        res += TEST_int_eq(trace_string(0, 0, OSSL_STR80), strlen(OSSL_STR80));
+        res += TEST_int_eq(trace_string(0, 0, OSSL_STR81), strlen(OSSL_STR80));
+        res += TEST_int_eq(trace_string(1, 1, OSSL_CTRL), strlen(OSSL_CTRL));
+        res += TEST_int_eq(trace_string(0, 1, OSSL_MASKED), strlen(OSSL_MASKED)
+                           + 1); /* newline added */
+        res += TEST_int_eq(BIO_printf(trc_out, OSSL_BYE), strlen(OSSL_BYE));
+        res = res == 6;
         /* not using '&&' but '+' to catch potentially multiple test failures */
     } OSSL_TRACE_END(HTTP);
     return res;