From 11c839b9ef17acea4e961f7b55f0e169bbd15253 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 1 Aug 2023 13:48:13 +0100 Subject: [PATCH] fixup! Add support into qtest_shutdown for blocking mode --- test/helpers/quictestlib.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/helpers/quictestlib.c b/test/helpers/quictestlib.c index 5395bb532c7f9..8f28dfb898fc5 100644 --- a/test/helpers/quictestlib.c +++ b/test/helpers/quictestlib.c @@ -401,16 +401,13 @@ int qtest_shutdown(QUIC_TSERVER *qtserv, SSL *clientssl) ossl_quic_tserver_tick(qtserv); } +#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) tsan_store(&shutdowndone, 1); if (!tickserver) { -#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) if (!TEST_true(wait_for_thread(t))) ret = 0; -#else - TEST_error("Should not happen"); - ret = 0; -#endif } +#endif return ret; }