Re-enable the ssl_trace_test()

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28627)

(cherry picked from commit 0a6b53ac87b54de2f467165c3d25e1af6400280a)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 657350bbca4ee585d045678f0b5cfdb61c77b9e8..fbe284b9ff1e251a0b60fc2ea36e0702c95e7871 100644 (file)
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -122,17 +122,13 @@ static X509 *ocspcert = NULL;
 #define CLIENT_VERSION_LEN      2
 
 /* The ssltrace test assumes some options are switched on/off */
-/*
- * Disable SSL_TRACE_TEST to fix up CI pipeline a following commit
- * will resolve the testing issue
- * #if !defined(OPENSSL_NO_SSL_TRACE) \
- *   && defined(OPENSSL_NO_BROTLI) && defined(OPENSSL_NO_ZSTD) \
- *   && !defined(OPENSSL_NO_ECX) && !defined(OPENSSL_NO_DH) \
- *   && !defined(OPENSSL_NO_ML_DSA) && !defined(OPENSSL_NO_ML_KEM) \
- *   && !defined(OPENSSL_NO_TLS1_3)
- * # define DO_SSL_TRACE_TEST
- * #endif
- */
+#if !defined(OPENSSL_NO_SSL_TRACE) \
+        && defined(OPENSSL_NO_BROTLI) && defined(OPENSSL_NO_ZSTD) \
+        && !defined(OPENSSL_NO_ECX) && !defined(OPENSSL_NO_DH) \
+        && !defined(OPENSSL_NO_ML_DSA) && !defined(OPENSSL_NO_ML_KEM) \
+        && !defined(OPENSSL_NO_TLS1_3)
+# define DO_SSL_TRACE_TEST
+#endif
 
 /*
  * This structure is used to validate that the correct number of log messages