From 0ddcb55b602800d4a1bcf1e76ca32939ed4fdaa4 Mon Sep 17 00:00:00 2001 From: "Randall S. Becker" Date: Fri, 10 Nov 2023 20:24:22 +0000 Subject: [PATCH] Correct 50-nonstop.conf to support QUIC tests under SPT threading models. This fix also separates the FLOSS from SPT configurations which should not have been conflated in the 3.0 series. Related-to: #22588 Signed-off-by: Randall S. Becker Reviewed-by: Tim Hudson Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/22697) (cherry picked from commit e3c38759608bb48d70ddfdaa1c88bcd86069952d) --- Configurations/50-nonstop.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf index 53081576cc6..827a13b4eec 100644 --- a/Configurations/50-nonstop.conf +++ b/Configurations/50-nonstop.conf @@ -172,8 +172,10 @@ }, 'nonstop-model-spt' => { template => 1, + cflags => add('-Wnowarn=140'), defines => ['_SPT_MODEL_', - '_REENTRANT', '_ENABLE_FLOSS_THREADS'], + 'SPT_THREAD_AWARE_NONBLOCK', + '_REENTRANT'], ex_libs => '-lspt', }, @@ -182,7 +184,7 @@ # disable threads. 'nonstop-model-floss' => { template => 1, - defines => ['OPENSSL_TANDEM_FLOSS'], + defines => ['OPENSSL_TANDEM_FLOSS', '_ENABLE_FLOSS_THREADS'], includes => ['/usr/local/include'], ex_libs => '-lfloss', }, -- 2.47.2