git: 9eafbeea1c3e - stable/15 - libthr: libpthread/t_mutex.c tests should expect EDEADLK
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Nov 2026 01:09:55 UTC
The branch stable/15 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=9eafbeea1c3e6a44c8d13b176e26c5e8d024efd0
commit 9eafbeea1c3e6a44c8d13b176e26c5e8d024efd0
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-11-09 19:17:20 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2026-11-17 00:25:04 +0000
libthr: libpthread/t_mutex.c tests should expect EDEADLK
(cherry picked from commit be90f23d4a6c70cd829366612c53755b47c2986d)
---
contrib/netbsd-tests/lib/libpthread/t_mutex.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/contrib/netbsd-tests/lib/libpthread/t_mutex.c b/contrib/netbsd-tests/lib/libpthread/t_mutex.c
index ad841142f426..83f95be441f4 100644
--- a/contrib/netbsd-tests/lib/libpthread/t_mutex.c
+++ b/contrib/netbsd-tests/lib/libpthread/t_mutex.c
@@ -720,9 +720,10 @@ ATF_TC_BODY(timedmutex1, tc)
printf("Before acquiring mutex\n");
PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
- printf("Before endeavor to reacquire timed-mutex (timeout expected)\n");
+ printf("Before endeavor to reacquire timed-mutex "
+ "(deadlock detected)\n");
PTHREAD_REQUIRE_STATUS(mutex_lock(&mutex, &ts_shortlived),
- ETIMEDOUT);
+ EDEADLK);
printf("Unlocking mutex\n");
PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
@@ -745,9 +746,10 @@ ATF_TC_BODY(timedmutex2, tc)
printf("Before acquiring mutex with timedlock\n");
PTHREAD_REQUIRE(mutex_lock(&mutex, &ts_lengthy));
- printf("Before endeavor to reacquire timed-mutex (timeout expected)\n");
+ printf("Before endeavor to reacquire timed-mutex "
+ "(deadlock detected)\n");
PTHREAD_REQUIRE_STATUS(mutex_lock(&mutex, &ts_shortlived),
- ETIMEDOUT);
+ EDEADLK);
printf("Unlocking mutex\n");
PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));