From nobody Sat Sep 05 02:25:19 2026 X-Original-To: dev-commits-src-branches@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 4hcHHS4ZM8z6qk5W for ; Sat, 05 Sep 2026 02:25:24 +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 4hcHHS3yxVz3QGd for ; Sat, 05 Sep 2026 02:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788575124; 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=1Vj422DootCkdEXOY2w6gJaLApkMo1DKKiS3/1DEuMI=; b=WNBYRi/0UC7+u+Zms28YRPx/hF1Y8rCwyZH955jzaHVkQ2tF8coayIkzn7lGgv+bcQKzhc VBnmfMyGHU3R6RiWmU+cTYclAPnJu4UVv+JJI1h3fikyAy/IVMbzo+aixdqdMmHEP4ux/H f7Hmsby5z5O+WZyhedOTuLWEEoJQClt9xnGOFji2EcYb7eomXy16FV1aKCXmX+0lUjW5K0 Do7NKWwHJjRONmwG+4i1ve5e8Bsd8cjrCP7QRmtbh8n3suReXBqV+rqGUo1SzdpcBYgDXE mdWdi5UAsOoV1mgwepX4Y4h9e0qKSXSWDbDLCyuNifRSLGNUDwxPaCJHtv64Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788575124; a=rsa-sha256; cv=none; b=M0mfMsZoxe3ZFiN8Mt7H2maisNoDj6RsUZoHwCuIpHrseKlDAKbvb6phTrn1/Ep+samkjL H8EtXDmoI/KxTIe4Y320V9ELPTDmNYaJYzshvHulU0iPy7nVu0EVf6eQjOmApolfXmnoyC a6vJ9GzgmqrKBt9EQ/nwVHqhCCHjnttOV+t8jZWbsuEd/ZbDHyVpL/jIgf877dE9jQ5bP8 7n1brJ1pumY8g46da1vIGBjBtR+qig0nQroXCsaTituqIAZdLxeCUQpiHfH3/b53TTAaop PuuNRmcWfCjCogfKY+g3QxrgjbJGWXIHwwEv044jwCSzT6TpOhPJJtdfrhH9OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788575124; 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=1Vj422DootCkdEXOY2w6gJaLApkMo1DKKiS3/1DEuMI=; b=l7EydcOoo6mmG0NdfsRoFdEtrlhXNQwoyhjc2g4UG5uOKnlAa+2FNR3tnNR94LKan34IpH CHFNvi+MF+mKE2Dd++Clh6gRo3/eEdg0wfDDp1Mim2mSj+Jwdp/9p8hSmzRRpX11M8fwX0 An/06IHph6CiZOBo/Ol0d7+6OYILRcob1A8dQaKRpHOrxASRFJqN7F6o8akDmldedBtoaR QQ/oG5omohmwN/rQDpV1RYYhxAoN02ilYbgY+ufofz0J0T1w0TQWnaVQmjNO4aj2/r0w5o 1AGCGYAJlG5Ft6ljNKqB6SrPGAyacPggNJdm3n7A6jgh4E0gEHTsDEyZyky/yA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcHHS2XxFzB1J for ; Sat, 05 Sep 2026 02:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33800 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 05 Sep 2026 02:25:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Cochard From: Konstantin Belousov Subject: git: 8ab5624f401c - stable/15 - tests/sys/kern: Skip capsicum procdesc tests when capability mode is unavailable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8ab5624f401c4830e0bbbe9f5287fc1a14d4864c Auto-Submitted: auto-generated Date: Sat, 05 Sep 2026 02:25:19 +0000 Message-Id: <6a9b7d8f.33800.13c440cf@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8ab5624f401c4830e0bbbe9f5287fc1a14d4864c commit 8ab5624f401c4830e0bbbe9f5287fc1a14d4864c Author: Olivier Cochard AuthorDate: 2026-08-05 20:46:10 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-05 02:24:50 +0000 tests/sys/kern: Skip capsicum procdesc tests when capability mode is unavailable (cherry picked from commit 3c5c55beee5ef80d8a9526480682cee86cbac584) --- tests/sys/kern/Makefile | 2 ++ tests/sys/kern/pdwait.c | 7 +++++++ tests/sys/kern/procdesc.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index b76303d120ba..5545b1200904 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -156,6 +156,8 @@ SRCS.subr_unit_test+= subr_unit.c CFLAGS.exterr_test+= -I${SRCTOP}/tests CFLAGS.ptrace_test+= -I${SRCTOP}/tests +CFLAGS.pdwait+= -I${SRCTOP}/tests +CFLAGS.procdesc+= -I${SRCTOP}/tests WARNS?= 3 diff --git a/tests/sys/kern/pdwait.c b/tests/sys/kern/pdwait.c index f95cbe2c3a4f..aae0891129e7 100644 --- a/tests/sys/kern/pdwait.c +++ b/tests/sys/kern/pdwait.c @@ -38,6 +38,8 @@ #include #include +#include "freebsd_test_suite/macros.h" + static void* unmapped(void) { void *unmapped; @@ -85,6 +87,8 @@ ATF_TC_BODY(capsicum, tc) pid_t pid; int status, r; + ATF_REQUIRE_FEATURE("security_capability_mode"); + pid = pdfork(&fdp, 0); if (pid == 0) _exit(42); @@ -195,6 +199,9 @@ ATF_TC_BODY(enotcap, tc) pid_t pid; int status; + ATF_REQUIRE_FEATURE("security_capability_mode"); + ATF_REQUIRE_FEATURE("security_capabilities"); + /*cap_rights_init(&rights, CAP_RIGHTS_ALL);*/ CAP_ALL(&rights); cap_rights_clear(&rights, CAP_PDWAIT); diff --git a/tests/sys/kern/procdesc.c b/tests/sys/kern/procdesc.c index 4e36c58ce2f2..d6f19548bd05 100644 --- a/tests/sys/kern/procdesc.c +++ b/tests/sys/kern/procdesc.c @@ -49,6 +49,8 @@ #include #include +#include "freebsd_test_suite/macros.h" + /* Tests for procdesc(4) that aren't specific to any one syscall */ /* @@ -348,6 +350,8 @@ ATF_TC_BODY(pdopenpid_child, tc) { pid_t child, parent; + ATF_REQUIRE_FEATURE("security_capability_mode"); + parent = getpid(); child = fork(); ATF_REQUIRE_MSG(child >= 0, "fork: %s", strerror(errno));