From nobody Sat Oct 10 17:43:58 2026 X-Original-To: dev-commits-src-main@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 4j2B1C1Cfzz6vYGG for ; Sat, 10 Oct 2026 17:43:59 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j2B1C0ZsGz4YyM for ; Sat, 10 Oct 2026 17:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791654239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vH0LQrn2L3uSErJZLuWVVhcjVOG9zl2evedHcC9OJoE=; b=fY2XxoZ8QIvehqGHPeFK1hyvR4h+Cw8nCkvZzAqiBQeQGKQFzZcLSDm7yJHuu8yYlGvki2 SLMif5mE5Uf+TAHZLFyFPvuyTlyNqRypigHoKLaDyPsJs2mI5BJd6vt46AlkQooDWWNgFS N+oyf8dV0d0Y+vlyMsCNyE/F7ekC4oY8VPRN9hjiTKWnQm9t/Ddj6geZH8IxXuBIBkkrUD ZYzKWF+wwRa1uyBh+sTl2FhDYDiJzosnFuJ35G7RPzCK9z8oHAhJepmSZHEnJTr20Al/mV Ja53MjQmUkpVaRhlE9YwMTjjCD6tcfwVQ/7ayEX02oKlExiYH0GP6CczaUrbIQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791654239; b=rqaJ/uXs4Guar8CiVSwPnV/5i9ZDUOzaYHWizaBztNOmRFB5FA951L6c6n8t6RKyuePvq1 lEWruydJ1LhIlUvyi/K6PxzDki+HDIlL04ixL7CvgpG3mEOSjA2uIUex1EHm2aMNu/cUls 90KCNmGPvxH0UK44iRGrt609FNEVas8Ti2I7n8P/Cr5gc4PTzpUsPsYGcyfdY1fwLSSBHQ y7w6a3h0nxjfwc6LeCTSs8RmoT6B8CzWdsQjgyHiKwFDJF4ZxxHXZly5GZa3VFOmx+QX8H O+TB9F5x7QmpbnsQ5t1b62H2+t7gmV/BHmY7FeveqbDUEuaU4eIgl/D8AV0zYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791654239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vH0LQrn2L3uSErJZLuWVVhcjVOG9zl2evedHcC9OJoE=; b=nuYpyGlmanYNgcVKfo6PM9hyXk7gcOUrG3VXWVhdTIPcOkkLkHWT9j/LcGBVU+4IbhzFJa y4PLoWKTQl0tzfKWM45lYJJ8kGmuoW5DqrM9YmAM+QC3UJcsfTQcbvlijlu2KBRazcvb6R d4NsaK3PMWCqz+f/FwUzYo1BAPZcCobEthKT8kuLlP7v0JLF+Y7hCnbNIsFCBbrL16ZeDi mqVSKZfr15p7oZcFh3OjHbkD5xuc6yXGNQsxar7pzW0zTJaXmlAFvm/LbpXSKUtae5a4xX 0F1WX6t4qz78BGvRgnEKLONSxZXucAPxdlKJBxiPNpH5sqpsPHwpcUce9wbcJA== 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 4j2B1B6m4tz14K5 for ; Sat, 10 Oct 2026 17:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d48c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 10 Oct 2026 17:43:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Xiaoqiang Zhao From: Enji Cooper Subject: git: d45f069002f2 - main - tests/libc: use an allowlist for sbrk in NetBSD-derived tests List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d45f069002f211398fd7790509fbd25ec6d1c713 Auto-Submitted: auto-generated Date: Sat, 10 Oct 2026 17:43:58 +0000 Message-Id: <6aca795e.1d48c.29660ba5@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d45f069002f211398fd7790509fbd25ec6d1c713 commit d45f069002f211398fd7790509fbd25ec6d1c713 Author: Xiaoqiang Zhao AuthorDate: 2026-10-10 17:39:44 +0000 Commit: Enji Cooper CommitDate: 2026-10-10 17:43:46 +0000 tests/libc: use an allowlist for sbrk in NetBSD-derived tests sbrk is obsolete and libc only provides it on amd64, arm, i386 and powerpc. Replace the growing exclusion lists in t_dir.c and t_mlock.c with a single positive HAVE_SBRK definition per file, so architectures without sbrk need not be enumerated as they are added. Signed-off-by: Xiaoqiang Zhao Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D60358 --- contrib/netbsd-tests/lib/libc/gen/t_dir.c | 14 ++++++++++---- contrib/netbsd-tests/lib/libc/sys/t_mlock.c | 14 +++++++++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/gen/t_dir.c b/contrib/netbsd-tests/lib/libc/gen/t_dir.c index 53d1fce26e2d..49800bfb3f34 100644 --- a/contrib/netbsd-tests/lib/libc/gen/t_dir.c +++ b/contrib/netbsd-tests/lib/libc/gen/t_dir.c @@ -38,7 +38,14 @@ #include #include - +/* + * sbrk is obsolete, and libc only provides it on a subset of + * architectures. + */ +#if defined(__amd64__) || defined(__arm__) || defined(__i386__) || \ + defined(__powerpc__) +#define HAVE_SBRK +#endif ATF_TC(seekdir_basic); ATF_TC_HEAD(seekdir_basic, tc) @@ -134,8 +141,7 @@ ATF_TC_BODY(seekdir_basic, tc) free(wasname); } -/* There is no sbrk on AArch64 and RISC-V */ -#if !defined(__aarch64__) && !defined(__riscv) +#ifdef HAVE_SBRK ATF_TC(telldir_leak); ATF_TC_HEAD(telldir_leak, tc) { @@ -185,7 +191,7 @@ ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, seekdir_basic); -#if !defined(__aarch64__) && !defined(__riscv) +#ifdef HAVE_SBRK ATF_TP_ADD_TC(tp, telldir_leak); #endif diff --git a/contrib/netbsd-tests/lib/libc/sys/t_mlock.c b/contrib/netbsd-tests/lib/libc/sys/t_mlock.c index d9ffbe366a04..b081c60bbecc 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_mlock.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_mlock.c @@ -46,6 +46,15 @@ __RCSID("$NetBSD: t_mlock.c,v 1.6 2016/08/09 12:02:44 kre Exp $"); #include #include +/* + * sbrk is obsolete, and libc only provides it on a subset of + * architectures. + */ +#if defined(__amd64__) || defined(__arm__) || defined(__i386__) || \ + defined(__powerpc__) +#define HAVE_SBRK +#endif + #ifdef __FreeBSD__ #include #define _KMEMUSER @@ -103,7 +112,7 @@ ATF_TC_BODY(mlock_err, tc) unsigned long vmin = 0; size_t len = sizeof(vmin); #endif -#if !defined(__aarch64__) && !defined(__riscv) +#ifdef HAVE_SBRK void *invalid_ptr; #endif void *buf; @@ -159,8 +168,7 @@ ATF_TC_BODY(mlock_err, tc) #endif (void)free(buf); -/* There is no sbrk on AArch64 and RISC-V */ -#if !defined(__aarch64__) && !defined(__riscv) +#ifdef HAVE_SBRK /* * Try to create a pointer to an unmapped page - first after current * brk will likely do.