From nobody Tue Oct 29 21:30:06 2024 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 4XdNhG5wCWz5bwm4; Tue, 29 Oct 2024 21:30:06 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XdNhG5P3pz4XXc; Tue, 29 Oct 2024 21:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730237406; 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=+aliNxZ502SNoEvoyT5ScyEhkb+GuIqjx71Nvo1j/Kw=; b=mBLqpWSL5u6gMFG1p/FzgjPLwBsxPFgUQqAYEtrsr4YgMZAIetwr8IL9oaInZ2ncOsX4gx U1ipovPWKaJFtrYRhjozmn7IlDnoWANHCptnGVvzea8hyklHdHkkctR9IH7q4t4+ATd+Kw dFWZMwFGXC0+VH5hi0YoyMfbBq17qW++UGKEAwAVyMs+SfHBEemVKyKrRl/JWM61s5+9q8 JHk7DQeTzsvz6tqqfncHuFrcYVCP/itrILCnoomNOTIMQskos5OCUtPw6fKnGBAEUBXR03 QTPdSFcHdXtTZkwybLhOtgTPwDQlYUtFr9rcQiOtw9yxvQPci+AggJtD9KbJ2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730237406; 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=+aliNxZ502SNoEvoyT5ScyEhkb+GuIqjx71Nvo1j/Kw=; b=Q75F2nGR+CPP5iXZLKgvycZil8s+/kC4v9wNKVRnFGVwA/LXy4Jk+lmL9sMwAi0OH+6vzG p6S1lhaMub9G7ZGGKxPnhq6sgX8koMSoMOxMwsmDLVQpcTbNI61WVU3VYbotbrzJ3SF6xA wBwkGVyusUKT4qgLqJUv7oHuyM428olSPTy/w7j7F+bi0Bf1QKVoj2FRXjKcEslMsJVKVy 04MLv4u8h9lxZDF4yhk6Z8fFleXDk219LgFiWqe5eK2g/Rn6AYZ5E6E+Mh6AuqaVNZEmIa GA9OC9mKtuDVPsvHN3a40aI6rKeFefSkD4A1EjaI3bfWn9JdDsnY+8PAvx+N+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730237406; a=rsa-sha256; cv=none; b=xEV5YmiHpLAgkg1hW8HjKyW7SiGpuVf5guLBVLJyU2gYQM6OHjBvfSI/Py36Pc6uscClqC MeDiw5N2FQZwARIcxZc+UuaS3h8m1rsBnGnq4wvHpb9YXNDEENw7LU7wKDjsTKBf5AzHwN vDiCe4USRypkgZe1bk3yoUhR7KuPkt+F/lDyBB+KFVKLzgmkjgGKgJhRtBbbisMyVfUU5k FcXKA/HJrrp+9Ip0/1iptuEGUJhpm0QD2ve1VVmCl6vBf3tDJRGVJOTxccxganw5AQgEjR Wwguaud0e5a9sZhBxJEWuIOP7CRqx0yBuR8s8j6sumMcx8SyNKjVWIfOpqhp/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XdNhG50GzzgYj; Tue, 29 Oct 2024 21:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49TLU6Ui020428; Tue, 29 Oct 2024 21:30:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TLU6q4020423; Tue, 29 Oct 2024 21:30:06 GMT (envelope-from git) Date: Tue, 29 Oct 2024 21:30:06 GMT Message-Id: <202410292130.49TLU6q4020423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Igor Ostapenko Subject: git: 2cb39df0a12f - main - tests: Switch sys/kern/sysctl_security_jail_children to execenv=jail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cb39df0a12fcb80a8debaaeabc44006827a70f1 Auto-Submitted: auto-generated The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=2cb39df0a12fcb80a8debaaeabc44006827a70f1 commit 2cb39df0a12fcb80a8debaaeabc44006827a70f1 Author: Igor Ostapenko AuthorDate: 2024-10-29 21:28:02 +0000 Commit: Igor Ostapenko CommitDate: 2024-10-29 21:28:02 +0000 tests: Switch sys/kern/sysctl_security_jail_children to execenv=jail Kyua skips tests based on the jail execution environment if a system is built WITHOUT_JAIL. Thus, the test case does not need to handle it. Reviewed by: markj Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D47105 --- tests/sys/kern/Makefile | 1 - tests/sys/kern/sysctl_security_jail_children.sh | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 933c1c9aa10e..b2d133a0457f 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -63,7 +63,6 @@ TEST_METADATA.sonewconn_overflow+= required_user="root" TEST_METADATA.sonewconn_overflow+= is_exclusive="true" ATF_TESTS_SH+= sendfile_test ATF_TESTS_SH+= sysctl_security_jail_children -TEST_METADATA.sysctl_security_jail_children+= is_exclusive="true" ${PACKAGE}FILES+= sonewconn_overflow.py ${PACKAGE}FILESMODE_sonewconn_overflow.py=0555 diff --git a/tests/sys/kern/sysctl_security_jail_children.sh b/tests/sys/kern/sysctl_security_jail_children.sh index d4c57915880f..ac990e57ff74 100644 --- a/tests/sys/kern/sysctl_security_jail_children.sh +++ b/tests/sys/kern/sysctl_security_jail_children.sh @@ -24,21 +24,15 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# -# Even being is_exclusive="true" this test does not expect a host to spawn -# other jails during the test execution. -# atf_test_case "max_cur" "cleanup" max_cur_head() { atf_set descr 'Test maximum and current number of child jails' atf_set require.user root + atf_set execenv jail } max_cur_body() { - if ! which -s jail; then - atf_skip "This test requires jail" - fi origin_max=$(sysctl -n security.jail.children.max) origin_cur=$(sysctl -n security.jail.children.cur)