From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Wed, 19 Feb 2025 17:55:42 +0000 (+0100)
Subject: Re-enable RCU torture test on MACOSX
X-Git-Tag: openssl-3.5.0-alpha1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d16d2f40a135830ee667e1588c75293a7b23480;p=thirdparty%2Fopenssl.git

Re-enable RCU torture test on MACOSX

This test was disabled due to "Stochastic failures in
the RCU test on MACOSX" by #23967, which sounds like an
issue that is probably fixed now.

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26834)
---

diff --git a/test/threadstest.c b/test/threadstest.c
index 3d7324cf6ca..71cdb37296e 100644
--- a/test/threadstest.c
+++ b/test/threadstest.c
@@ -295,7 +295,6 @@ static int torture_rw_high(void)
 }
 
 
-# ifndef OPENSSL_SYS_MACOSX 
 static CRYPTO_RCU_LOCK *rcu_lock = NULL;
 
 static int writer1_done = 0;
@@ -492,7 +491,6 @@ static int torture_rcu_high(void)
     contention = 1;
     return _torture_rcu();
 }
-# endif
 #endif
 
 static CRYPTO_ONCE once_run = CRYPTO_ONCE_STATIC_INIT;
@@ -1329,10 +1327,8 @@ int setup_tests(void)
 #if defined(OPENSSL_THREADS)
     ADD_TEST(torture_rw_low);
     ADD_TEST(torture_rw_high);
-# ifndef OPENSSL_SYS_MACOSX
     ADD_TEST(torture_rcu_low);
     ADD_TEST(torture_rcu_high);
-# endif
 #endif
     ADD_TEST(test_once);
     ADD_TEST(test_thread_local);