From nobody Sat Dec 20 01:10:41 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 4dY5tn5wwnz6L2XG for ; Sat, 20 Dec 2025 01:10:41 +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 4dY5tn3HJkz3tgY for ; Sat, 20 Dec 2025 01:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766193041; 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=DaNumC+4d4gcZLOUQN0ZRRQ94ku4rBDcsCwjy6YvUns=; b=JiTnWQiWQFM3C1J8ljrvaGzG+1WPpHencNIzC4Au5QSb5h3rgnbjG/JiYycXQe5lwRclYB xct6PuX4XBLaMP7MPG7pg0vweilz0ousfJUcZmd/RJaVCghfbBRwSjy3CE+AFjEunhCDxR a9TWvhJyHN0XabAealcTL4vdmga8Xvn6xrkTGDvdMaf3QOv1goUeZ7LPo5uR9CMZZDtj40 Zij7euBz/N4t2CLZuZR2WyCN0ymShmdjA/Im1cluUKuiwkw5fDLQiT3Bw0OZR/Lxu10Xeh RVSgTlkHXTpwUfTUJao2zraWS6n7+BryPV6UchkvIozeWLK4shB6jUGILx1XCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766193041; 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=DaNumC+4d4gcZLOUQN0ZRRQ94ku4rBDcsCwjy6YvUns=; b=nDgDJWcGlRFl7ibvyV1n12RjJeQHTKmiJD2xyQCtT+se8Ut+IRfaL3objOUAQo1CwwKkHe NIqioMY5wE7ts2S0+oA9L9t+gOkvX+QO5PX4rGihdyiX/7rxLDt90YV+8qYD7aSQYY0L7v 57O+scIYpF8V7ZqFF4OnbyUjLokeVnD2pKK4CFqPxH/EznsL3TGZ8Ngfh4BZOYwdNPBnhg fsZgJ2fxws1GOG5qAfv1RRt46qMb6E9Tq31n6quCgg+B3fdhT5Pyu9D93AVYebQj76Phi1 ri+pK0Ebi0ZPlfH/YK0J37uLGrMIum3G0pvmS/5DSUx9vku9WUIv0SVlJHp4Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766193041; a=rsa-sha256; cv=none; b=PhwL6zZ+QJL029gbt0W9jURi4lbJsdZ9+6VEIh/+mPx+Bjv4yeItNLgYK0ydocL7HJZJb/ CK3bNd9bOdFQSS5+ISDyZzw9hQJ/5al0aW/3Pa5rgxZQiHBjQ86MdnBBHHDEUeoSALVAPQ BVxfThnYudfoKbrQSo81LloIAktyCAFRxxMa0H2DUC4/A0x80y18qo5TtPqpuxUp5t35+J dtKno77fDGwA8Tc6oRmkvH/rtPccDkPhIxRSifJX3ZlJzX0Jd8Q4cFpxDAYOlI0TgxhBxZ eu0RdYPCDdMZDmlO+v3PkOqY4uOhRnWZ3yYwlHuywwgeuKPIdWpyYWJ55xV3hg== 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 4dY5tn2XXDzYnw for ; Sat, 20 Dec 2025 01:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34ded by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 20 Dec 2025 01:10:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 9bbfffe39e87 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 9bbfffe39e87bc20818ea68efaf07399b83764bc Auto-Submitted: auto-generated Date: Sat, 20 Dec 2025 01:10:41 +0000 Message-Id: <6945f791.34ded.5a667a92@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=9bbfffe39e87bc20818ea68efaf07399b83764bc commit 9bbfffe39e87bc20818ea68efaf07399b83764bc Author: Jose Luis Duran AuthorDate: 2025-12-09 15:45:01 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-20 01:06:52 +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 }