Skip to content

Commit

Permalink
Correct 50-nonstop.conf to support QUIC tests under SPT threading mod…
Browse files Browse the repository at this point in the history
…els.

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 <randall.becker@nexbridge.ca>

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #22697)

(cherry picked from commit e3c3875)
  • Loading branch information
rsbeckerca authored and t8m committed Nov 14, 2023
1 parent 7602bf8 commit 0ddcb55
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Configurations/50-nonstop.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},

Expand All @@ -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',
},
Expand Down

0 comments on commit 0ddcb55

Please sign in to comment.