From nobody Thu Feb 8 06:04:25 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 4TVmf20dG9z591cC; Thu, 8 Feb 2024 06:04:26 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TVmf16cqRz4G3F; Thu, 8 Feb 2024 06:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707372265; 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=E9CeAUiAbBgE/yrYwjSxT8KGmbCC3yAhS4S071ONdhM=; b=jAXuZX5Rj/Ae4AQ5DHxt7idhkgod2W+wwTTHyudIzA2uJ9NIKfPYUUflRJUG7v9b5gKeHG uc99fvuXp7W4+yg/mDhhkjk8wcxQqLN7lMPVQkuXqeRZ2mOcv3gwfKXIgFkYorr1TBWMDT UJjBxStfqTXB7wY8cL32U1gvndqeQvXNbVsjU0bvyvFBv5kJ6HQEFLJMdH50k44gbAcDpM FHotl3UH/Axd+o4xvqtymDqociBVh0sIipBzotGzkVc5DAnUmM+URmCRHL4cp7Fxp54p2N 9MPERULR9acL8+mPCTnVAGIwgBy82YewYQgVwkWZ7ntc3GAzrhm0wGmtmmrZXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707372265; 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=E9CeAUiAbBgE/yrYwjSxT8KGmbCC3yAhS4S071ONdhM=; b=phuoWI2VIduJ2UYurewcZFop3Gi3J5lR1P9hiT2PbMZyrOW1T9jg1GAwAd1P6mTeYuyx69 dUCNEf2H7jLuLHiICM745Hbv8yha7qSmlDARu19s4TJ0FjS03Nj2jLZVQyPpefUYsJ6nU0 rkr5NlxDe3jFicuBaxYOQOmjm11NKVIhOOweezw+G+UgHeMXOBI9Pqh6vRluh8gxdSk7TK +Tipy2YUcNFbg7F6J9qGfPNsbIe35ZSRIFct7/GQ2IneCJ7nlcr1Vn80PPK+LqGLxCW8PP gqQLJDFHCr12nlS6d/O4FfvznnHnnlF7F90wzEmc6KBanq0rLOYNhlaFjOk6Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707372265; a=rsa-sha256; cv=none; b=ANy2LsPn9u+y5foVOjVCwLfUbEUrX0qBOUgjlknNoCzKBwnJPmhAQQ953MKH+h444nuK7+ ulNP1tJzuaneczPBIIXul4uV9bQJT8JYaiI1ODO2iC5ni2OrBkCxplfL8p6EbighQaxqCy VC4NCw5jhawOKP/o8r+dxR+L6pwUy+uFQqGczqhpi07tbi4QKq86w8PzCND5bJMKDPNRpV kLnkYsokEr5WELOax9Z7bRnkdJSN4ueTqyjFatMEe/OHoM2krCR/N3T8zjplOA9UQiC19J iX2WMnXgAQqVO9+xIaaonJJfyb2GYfRtHfGYI0SKHM68h6jbSujVx1j3gnXGZw== 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 4TVmf15hnXzdBy; Thu, 8 Feb 2024 06:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41864PQE064880; Thu, 8 Feb 2024 06:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41864P8W064877; Thu, 8 Feb 2024 06:04:25 GMT (envelope-from git) Date: Thu, 8 Feb 2024 06:04:25 GMT Message-Id: <202402080604.41864P8W064877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 416b7acd5be2 - stable/13 - hostname(1): Add test cases 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 416b7acd5be2626cfbbfe1127571227d42b7462f Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=416b7acd5be2626cfbbfe1127571227d42b7462f commit 416b7acd5be2626cfbbfe1127571227d42b7462f Author: Lin Lee AuthorDate: 2024-01-17 04:30:29 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-08 06:03:49 +0000 hostname(1): Add test cases Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1069 (cherry picked from commit 73974a78f7f60acdbb26cdd5325c21c0bb1d2d4d) --- bin/hostname/Makefile | 5 +++ bin/hostname/tests/Makefile | 6 +++ bin/hostname/tests/hostname_test.sh | 87 +++++++++++++++++++++++++++++++++++++ etc/mtree/BSD.tests.dist | 2 + 4 files changed, 100 insertions(+) diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile index 6e1b79f0348f..e6abe3861ce3 100644 --- a/bin/hostname/Makefile +++ b/bin/hostname/Makefile @@ -1,6 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 +.include + PACKAGE=runtime PROG= hostname +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests + .include diff --git a/bin/hostname/tests/Makefile b/bin/hostname/tests/Makefile new file mode 100644 index 000000000000..87295101392f --- /dev/null +++ b/bin/hostname/tests/Makefile @@ -0,0 +1,6 @@ +PACKAGE= tests + +ATF_TESTS_SH= hostname_test +BINDIR= ${TESTSDIR} + +.include diff --git a/bin/hostname/tests/hostname_test.sh b/bin/hostname/tests/hostname_test.sh new file mode 100644 index 000000000000..57517821f7f1 --- /dev/null +++ b/bin/hostname/tests/hostname_test.sh @@ -0,0 +1,87 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Lin Lee +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +# +# These tests need to run in a multibyte locale with non-localized +# error messages. +# +export LC_CTYPE=C.UTF-8 +export LC_MESSAGES=C + +test_jail_name="test-hostname-jail" + +test_jail_conf='%%test_jail_name%% { + host.hostname = "test-hostname.example.org"; + path = "/"; + persist; +}' + +init() +{ + echo "${test_jail_conf}" | \ + sed -e "s/%%test_jail_name%%/${test_jail_name}/" > "./jail.conf" + jail -f "./jail.conf" -c ${test_jail_name} +} + +recycle() +{ + jail -f "./jail.conf" -r ${test_jail_name} + rm "./jail.conf" +} + +atf_test_case basic cleanup +basic_head() +{ + atf_set require.user root + atf_set "descr" "basic test for getting hostname" +} +basic_body() +{ + init + + result=$(jexec ${test_jail_name} "hostname") + atf_check_equal "test-hostname.example.org" "${result}" + + result=$(jexec ${test_jail_name} "hostname" -s) + atf_check_equal "test-hostname" "${result}" + + result=$(jexec ${test_jail_name} "hostname" -d) + atf_check_equal "example.org" "${result}" + + jexec ${test_jail_name} "hostname" "test-bsd2" + result=$(jexec ${test_jail_name} "hostname") + atf_check_equal "test-bsd2" "${result}" +} +basic_cleanup() +{ + recycle +} + +atf_init_test_cases() +{ + atf_add_test_case basic +} diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 5714d873cb3b..16e19c967773 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -21,6 +21,8 @@ .. expr .. + hostname + .. ln .. ls