Date: Thu, 31 Oct 2024 17:45:59 GMT From: Igor Ostapenko <igoro@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 68e013783780 - main - tests: Switch bin/hostname/hostname_test to execenv=jail Message-ID: <202410311745.49VHjx98065542@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=68e01378378089a9b8543a53a4e80b231133c92d commit 68e01378378089a9b8543a53a4e80b231133c92d Author: Igor Ostapenko <igoro@FreeBSD.org> AuthorDate: 2024-10-31 17:44:49 +0000 Commit: Igor Ostapenko <igoro@FreeBSD.org> CommitDate: 2024-10-31 17:44:49 +0000 tests: Switch bin/hostname/hostname_test 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/D47334 --- bin/hostname/tests/hostname_test.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bin/hostname/tests/hostname_test.sh b/bin/hostname/tests/hostname_test.sh index a4d4d54bb052..a032fd91229b 100644 --- a/bin/hostname/tests/hostname_test.sh +++ b/bin/hostname/tests/hostname_test.sh @@ -42,9 +42,6 @@ test_jail_conf='%%test_jail_name%% { init() { - if ! which -s jail; then - atf_skip "This test requires jail" - fi echo "${test_jail_conf}" | \ sed -e "s/%%test_jail_name%%/${test_jail_name}/" > "./jail.conf" jail -f "./jail.conf" -c ${test_jail_name} @@ -61,6 +58,7 @@ basic_head() { atf_set require.user root atf_set "descr" "basic test for getting hostname" + atf_set execenv jail } basic_body() { @@ -81,9 +79,6 @@ basic_body() } basic_cleanup() { - if ! which -s jail; then - atf_skip "This test requires jail" - fi recycle }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410311745.49VHjx98065542>