From nobody Thu Feb 8 06:03:26 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 4TVmct72qlz591c6; Thu, 8 Feb 2024 06:03: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 4TVmct6Q9kz4Fc7; Thu, 8 Feb 2024 06:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707372206; 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=BvmzY+tTGzkIpQgljAPrbaNp/dipro4Ih/6QRXn6r88=; b=imtOnYYS/Cp1KpT1s2A20oTj3dsU3UNSMLuJVM76g38oUoOA8k0l4wLsg9Kq9arZ3Mgxc0 iLIPLUtz90sdt/YjnZYfxCcVM265ua86C9j6wwh6v1E9kjMBZ51WaOBdMDR0hAJKkHYdYE H1Fyc4KN0vGrxcLG/uEwYV++DM+EUWFKH2V4q5N7OFs83H9aggjGQ62lXExE5pY+jYSJsv xMcCVrKU08Qttv1F/R0YUJrdAHLq7dZlN514cdnRsVMlvk2YC3Vc0Nidksi/4XrFbDMqYK hx6iN1TSD3UrUt1tmg7dOfX00zEYYUx4qL4ERljns0zmahYgplwVRFIr4Cyjeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707372206; 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=BvmzY+tTGzkIpQgljAPrbaNp/dipro4Ih/6QRXn6r88=; b=T6lfRewqWNlbH7y5nzqgRjrOZS3YtH9AIbPT0Ohl/ZIz+AqBO3QSHO+NMM4YbSk9yR9WUS iIP4H+xPyN0tvHyv+OIMTDCjeqELOttQw337rpp3ApYRsL+NACu3fbzbh1UPoqg51hanfn JculH4guHufFZlY+R2oxAoTSBYqsGAhdlPfy8kcfqrS7BEZp1+pzy/lWKLziwPvKpJnr27 Eu9L66lPWgy8iOe274wtt/tDilXbDAxYPLpkA4DJsCRd2GxdRZkb1wuxdT9DPAi0UtqRIW DOE5toujRWxK0LiN4MG1ZpQkAIT3jqWuyZa35mg+uC2xk1fLdM70wFiwmqJTxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707372206; a=rsa-sha256; cv=none; b=rF9c7QlyUgITvpK0Fb1BEtg6bqtQgdW4gBHmlkzBfu47G69Jhdb29a4xQgmvAHWfGFvTG+ mDBuwY3TxP1LICAegqx4EOpNvBwwG0R4HsnmmKbCl+o4pFDuF8MD/BLR+PcbZhIcMCenqZ gysa/eoK5E5jVx5RMmrOCSkIe52O/dv+Z5IQjtUQuvCV/leJhl3yNr/JX03ZX1lH4RiV91 wSUoy/ixfsEwL47JAxrf0Zg5RDRnDTf0OhElRMwVJ9oaT0QUeZ9yRblsFSe6dJAgojxWX5 6D1la2C71Obr8bWzBHVt/4TADlsZicZmjhrrlxomw1JU/Rho3LCalVH1oBFMaQ== 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 4TVmct5TqjzdkZ; Thu, 8 Feb 2024 06:03:26 +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 41863QTt064597; Thu, 8 Feb 2024 06:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41863QXM064594; Thu, 8 Feb 2024 06:03:26 GMT (envelope-from git) Date: Thu, 8 Feb 2024 06:03:26 GMT Message-Id: <202402080603.41863QXM064594@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: 6efcd634c6f9 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 6efcd634c6f9fdf3976f9fa2ce16c5584c3e3c2c Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=6efcd634c6f9fdf3976f9fa2ce16c5584c3e3c2c commit 6efcd634c6f9fdf3976f9fa2ce16c5584c3e3c2c Author: Lin Lee AuthorDate: 2024-01-17 04:30:29 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-08 06:02:33 +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 04f179a7632d..8b985f3b4682 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -21,6 +21,8 @@ .. expr .. + hostname + .. ln .. ls