root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Matt Caswell 2023-06-30 16:50:47 +01:00 committed by Pauli
parent 0cea6df239
commit 1be2ee683c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/quicapitest.c
View File

@ -28,6 +28,13 @@ static char *datadir = NULL;
static int is_fips = 0; 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 that we read what we've written.
* Test 0: Non-blocking * Test 0: Non-blocking
@ -208,7 +215,7 @@ static int test_version(void)
return testresult; 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) static void strip_line_ends(char *str)
{ {
size_t i; size_t i;
@ -636,7 +643,7 @@ int setup_tests(void)
ADD_ALL_TESTS(test_quic_write_read, 2); ADD_ALL_TESTS(test_quic_write_read, 2);
ADD_TEST(test_ciphersuites); ADD_TEST(test_ciphersuites);
ADD_TEST(test_version); 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); ADD_TEST(test_ssl_trace);
#endif #endif
ADD_TEST(test_quic_forbidden_apis_ctx); ADD_TEST(test_quic_forbidden_apis_ctx);