From: Matt Caswell <matt@openssl.org>
Date: Fri, 30 Jun 2023 15:50:47 +0000 (+0100)
Subject: Skip the QUIC ssltrace test under certain config options
X-Git-Tag: openssl-3.2.0-alpha1~499
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1be2ee683c3cbd8690728a05e05b778d5f7674b8;p=thirdparty%2Fopenssl.git

Skip the QUIC ssltrace test under certain config options

Various options disturb the output expected from the ssl trace test, so we
skip it if necessary.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21332)
---

diff --git a/test/quicapitest.c b/test/quicapitest.c
index 626b79eaf1f..6dc57badeef 100644
--- a/test/quicapitest.c
+++ b/test/quicapitest.c
@@ -28,6 +28,13 @@ static char *datadir = NULL;
 
 static int is_fips = 0;
 
+/* The ssltrace test assumes some options are switched on/off */
+#if !defined(OPENSSL_NO_SSL_TRACE) && !defined(OPENSSL_NO_EC) \
+    && defined(OPENSSL_NO_ZLIB) && defined(OPENSSL_NO_BROTLI) \
+    && defined(OPENSSL_NO_ZSTD)
+# define DO_SSL_TRACE_TEST
+#endif
+
 /*
  * Test that we read what we've written.
  * Test 0: Non-blocking
@@ -208,7 +215,7 @@ static int test_version(void)
     return testresult;
 }
 
-#if !defined(OPENSSL_NO_SSL_TRACE) && !defined(OPENSSL_NO_EC) && defined(OPENSSL_NO_ZLIB)
+#if defined(DO_SSL_TRACE_TEST)
 static void strip_line_ends(char *str)
 {
     size_t i;
@@ -636,7 +643,7 @@ int setup_tests(void)
     ADD_ALL_TESTS(test_quic_write_read, 2);
     ADD_TEST(test_ciphersuites);
     ADD_TEST(test_version);
-#if !defined(OPENSSL_NO_SSL_TRACE) && !defined(OPENSSL_NO_EC) && defined(OPENSSL_NO_ZLIB)
+#if defined(DO_SSL_TRACE_TEST)
     ADD_TEST(test_ssl_trace);
 #endif
     ADD_TEST(test_quic_forbidden_apis_ctx);