From nobody Tue Nov 17 01:09:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jT68g4Rlyz71Q1R for ; Tue, 17 Nov 2026 01:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jT68g2s44z3Cgk for ; Tue, 17 Nov 2026 01:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794877795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viMSkp2mQMjS+an+UXovuQ7Q7xPAeMcf8GEfY9QttPk=; b=Vu1SU/55nmPwxm9l/XmZg2gx88V31FzAaSjCAw39WMXj7LLuyIS3haMVFHrvEeIJ0yVDIK vY67QJsuQ4S+14l6iQ8lRYBcC4pk4eprynq1bIpG5O793gBoG7BwSXZ3p//N36zyPrN0RU Xkvm98hbMdas4LEWhL+uFOLpenM3g/OaSo1X/D2MmOktejEPfH2/Khgp02KAj86uN/HN3+ s5YJQcVpGP0ALgPYRLknqZdBwEUUbeK5q6Pfr37EUjAeKqaSRg2/KSqjjdeo0yYIowe7Eu GodEqZXGymL/zK6spFuWvx1wR3/EXY7mWwZOJOQ53h/LUPYYgyu2Ei5ImBbqMg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794877795; b=NYmfHKA7xdCYtA32OOaZxJVm1VvQ2LLLITf6UkcocwxOo69OIbZH3xhvizYfUDJyyKncWB Vig5JWrep+3BrAdMKlPIODNUN5ghAFKN598BvMwmp+e8b5bZsEWogRew5IOzjgaj4/Rjga a24QgR7WwI3eJcmYrCWBFAauIQ0rlUSDLAtJD37XUbi+DwxI5f0OYevlsdRE5H52fF722h O7+VgZMiebnOSKlMiOhIsYsDNpTnhaLrSDl+ITP9xoZQKsasWNziVWLoOdZe9M2oJML1qx WAxOo+x2HUzo/zDVq3ZUM+ncb4iPIFo7iQDMu5D5AMN+7HAr1uG/vcpdJFRsiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794877795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viMSkp2mQMjS+an+UXovuQ7Q7xPAeMcf8GEfY9QttPk=; b=kZ1CDoEJoZ9rAB0tTGneOmS8EsYDDW3ZUDuiQO4K/of9hC7lwFVm2OEFGayseYOqu0h4Xu q6OtReqE6sNTitMYSgz0tzkiSEoZ1eyzALREpHcsMQfaEnmRQj3gtc/fcNS0Ee5eHKNCEw vcBlfm9PNU7IWOnja3BDGlGQyz4cumGWuyGs8Vwz2dLaqGTARuodSCCYN4GKgGGnNMo+FO ctR/H/WFHQ/Py4XME+d4/wHwBmabAAKAw/AedoUMLCkRrx7QsiCyt8y7CQIByLir5p3H4g KTDZ37qJStBOoWu3/c1LgF8SIwIOoal6e2KjwGg1q+RW9OwkPbtd5GbkFtpWZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jT68g2WxtzHlR for ; Tue, 17 Nov 2026 01:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1022 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 01:09:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9eafbeea1c3e - stable/15 - libthr: libpthread/t_mutex.c tests should expect EDEADLK List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9eafbeea1c3e6a44c8d13b176e26c5e8d024efd0 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 01:09:55 +0000 Message-Id: <6afba963.1022.5cb957c0@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9eafbeea1c3e6a44c8d13b176e26c5e8d024efd0 commit 9eafbeea1c3e6a44c8d13b176e26c5e8d024efd0 Author: Konstantin Belousov AuthorDate: 2026-11-09 19:17:20 +0000 Commit: Konstantin Belousov 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));