From 9bf0d8e52a18aa8dd79df29883c79dc6ed5a03a4 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 12 Aug 2024 13:15:42 +0200 Subject: [PATCH] pthread-rwlock: Attempt harder to avoid test failure on macOS. * tests/test-pthread-rwlock-waitqueue.c (STEP_INTERVAL): Bump the minimum interval to 50 ms on macOS. --- ChangeLog | 6 ++++++ tests/test-pthread-rwlock-waitqueue.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7533e2f5b7..035f5d1151 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-08-12 Bruno Haible + + pthread-rwlock: Attempt harder to avoid test failure on macOS. + * tests/test-pthread-rwlock-waitqueue.c (STEP_INTERVAL): Bump the + minimum interval to 50 ms on macOS. + 2024-08-12 Bruno Haible pthread-rwlock tests: Move the waitqueue test into a separate module. diff --git a/tests/test-pthread-rwlock-waitqueue.c b/tests/test-pthread-rwlock-waitqueue.c index bfe5770463..3267ebe920 100644 --- a/tests/test-pthread-rwlock-waitqueue.c +++ b/tests/test-pthread-rwlock-waitqueue.c @@ -49,11 +49,11 @@ /* Some platforms need a longer STEP_INTERVAL, otherwise some of the assertions RRR, RRRR, RRRRR fail. */ -#if defined _WIN32 || defined __CYGWIN__ -/* Windows */ +#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __CYGWIN__ +/* macOS, Windows */ # define STEP_INTERVAL 50000000 /* nanoseconds */ -#elif (defined __APPLE__ && defined __MACH__) || (defined __FreeBSD__ || defined __DragonFly__) || (defined __linux__ && defined __hppa) -/* macOS, FreeBSD, Linux/hppa */ +#elif (defined __FreeBSD__ || defined __DragonFly__) || (defined __linux__ && defined __hppa) +/* FreeBSD, Linux/hppa */ # define STEP_INTERVAL 20000000 /* nanoseconds */ #else # define STEP_INTERVAL 10000000 /* nanoseconds */ -- 2.39.5