From nobody Sat Dec 20 01:11:21 2025 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 4dY5vY5dQLz6L2Xr for ; Sat, 20 Dec 2025 01:11:21 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dY5vY2Lnyz3vbZ for ; Sat, 20 Dec 2025 01:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766193081; 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=8xG09srwRGr16Px0FONY4rpwtbjO9JF6CYyVAN1hLCY=; b=UIzivbcuOPIJqA3ZsYAMmesKw5Hp7n7AFF++OoR7egmAynTn3Hn3Dugrk5+2gML2bbWAlg 2lT2Ae86Zls6NGy9zRresMMumtAV87LbOimQUK5UXR/sgt2wujey/DGiYiVRmn2JBrqzRe WZ901kgjdb7k3I8QePCpssJmhFros18/mA1Vekjro0imF7LyUHntL6zkWMbrrk6xwrbEnS 3XJRdXNb+YPDXHSdPmC1O+YhHK88XeZDEP/SgR2FflXsOVKohyoWsJ+94ObUmps5q6yRyq RlWPDGL6EIL76/h89fk4mRBEyif/eJ+ZWeR/Aa/Jd2kg8I8LmwDvP0GwDQIBnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766193081; 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=8xG09srwRGr16Px0FONY4rpwtbjO9JF6CYyVAN1hLCY=; b=SZX9Py1V3Dxy/F67ZU5zUYqhITbGoXg90jJQCts0iXqxkGYJe/fIZTo6z/8Yo5cQRao5Hv BjjLihemYZ9p41bvNykGfzC85N7x0WeJVTlWhx/gAHqZiijk1NhhKfNUgf5VHbTWKYvMue 3IQihX3tI2dnuyabJiipcYszWYi/+gENu5GqH1GK/vClUGRHsCDVBLQa6dnSGED9f2bsU0 RFvT95LsUcMXxTeVynGI7HSJsUmt4qGcRhQqbplKysvmcU26M5mJPMdu33rwVovTzgQ5QH hf0V5act6COgxhW+sOw7rUou/4oUKtSEHf0WmwCmYVWV6lCtDlprULJW8+Ceag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766193081; a=rsa-sha256; cv=none; b=yh8u7rn0ue8y/uII6qryPiV74bswkEkbyuW0lOpRrtFgbVEshzTXhFZtbcQFIXN+UrH9t0 qVFj1UphRy0pRR15Hn1F8Yil/KtEFGHcLZAmgdjgl3uB6Qm+d4zr5VjSd/n/nM8KljEbmT dQ1FZzcCrdyaKiIEfTWLOJxQ2+JeRkeXyuh4jVAbaNZjZHUpVty5Pk/U2HXe0NGtUTos6D NIyb1L4xQ8U4stIlxF6DuhIliZEVmAmMmiz3mbMuZ0nfozyKiLzTHqih5Yv868TvK8jfzn uxOKYZLj7bziCIpzw7oJJZc8BVOJxIaqZErs3wGQMtkiJ/NgY6IxSMa3ErzAzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dY5vY1bd0zYNh for ; Sat, 20 Dec 2025 01:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3414b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 20 Dec 2025 01:11:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 2011380115d0 - stable/13 - mtree: tests: Import NetBSD's mtree test suite 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2011380115d0d1a862dc3b09bd2043e218333731 Auto-Submitted: auto-generated Date: Sat, 20 Dec 2025 01:11:21 +0000 Message-Id: <6945f7b9.3414b.393e9d1c@gitrepo.freebsd.org> The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=2011380115d0d1a862dc3b09bd2043e218333731 commit 2011380115d0d1a862dc3b09bd2043e218333731 Author: Jose Luis Duran AuthorDate: 2025-12-09 15:45:01 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-20 01:08:49 +0000 mtree: tests: Import NetBSD's mtree test suite Manually import latest mtree test suite from NetBSD. MFC after: 1 week (cherry picked from commit 2f29d0f3e6d25599c188c94bf1e395d9cbeb2a4d) --- contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh | 40 +++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh b/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh old mode 100755 new mode 100644 index 5daefd84e928..5e4177c792a5 --- a/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh +++ b/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_mtree.sh,v 1.7 2017/01/14 20:45:16 christos Exp $ +# $NetBSD: t_mtree.sh,v 1.10 2023/12/02 16:18:17 christos Exp $ # # Copyright (c) 2009, 2012 The NetBSD Foundation, Inc. # All rights reserved. @@ -447,6 +447,42 @@ mtree_specspec_type_body() fi } +atf_test_case mtree_onlyfile +atf_test_case netbsd6_onlyfile +onlyfile_head() +{ + atf_set "descr" "Test -O with same hash value in directory and leaf" +} + +onlyfile_body() +{ + mkdir -p ab/no + echo ./ab/no >onlyfile + mtree -F ${FLAVOR} -c -n -O onlyfile >output + if [ ! -s output ]; then + atf_fail "mtree did not find path in onlyfile" + fi +} + +mtree_onlyfile_head() +{ + FLAVOR=mtree onlyfile_head +} +netbsd6_onlyfile_head() +{ + FLAVOR=netbsd6 onlyfile_head +} + +mtree_onlyfile_body() +{ + FLAVOR=mtree onlyfile_body +} +netbsd6_onlyfile_body() +{ + FLAVOR=netbsd6 onlyfile_body +} + + atf_init_test_cases() { atf_add_test_case mtree_create @@ -459,6 +495,7 @@ atf_init_test_cases() atf_add_test_case mtree_merge atf_add_test_case mtree_nonemptydir atf_add_test_case mtree_specspec_type + atf_add_test_case mtree_onlyfile atf_add_test_case netbsd6_create atf_add_test_case netbsd6_check @@ -469,4 +506,5 @@ atf_init_test_cases() atf_add_test_case netbsd6_ignore atf_add_test_case netbsd6_merge atf_add_test_case netbsd6_nonemptydir + atf_add_test_case netbsd6_onlyfile }