From nobody Sat Dec 13 14:38:19 2025 X-Original-To: dev-commits-src-main@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 4dT8806L6Xz6KVsd for ; Sat, 13 Dec 2025 14:38:24 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dT8804R4Tz45QD for ; Sat, 13 Dec 2025 14:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765636704; 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=5ZzMh2ydCJLAmfkCoVNqldM37i1Q+B105ei9JPICQV8=; b=Q4Ay+++1V/aBw40117wVqlvHw9LIJdpMSXMR6lOE51U11YrakO3WkKTIDMZ8VNi3WuPwmY YjiB60K71u8Hs1PTCVTAhFc4fftmlenjK3x6P8NQLcLASu3lRSkLQmXfVITH4Z6/h2qRzM FOW7Lvm+cOEVBzl8WagnH2zY+wX4elnGvCzFzATWEagunqwlAcknFk4zMsD0OfvlrtlNbO PVfuu8snK8xyFjqU51CDS1ia8+EC8sFb/E0sWYUF6SfcIGGKNbuQ2hlu8wH+HZBmUHw2zr /SQVDDNXE6+A9FBQvGKRll1T1VsNBu7ldT1GLw/N9vZh9QES1JyHP8vrw4mlVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765636704; 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=5ZzMh2ydCJLAmfkCoVNqldM37i1Q+B105ei9JPICQV8=; b=wb+xXV5YZeJM5gLKAJRfMorxV3WjJl9O8opJ+emkx9+iiGSgYrPVeIN7F+ogqT+51S8DRy DL6YFu7waSFKz0yjTQ4HyL4rVwf0h1J9QL2gHBTG4dRnKyivIIK5iyd0jztRHl4GpGRK6c usrSPETBsixPNtq/srM9XheK2T2ubkGX/v3cviiQ4tbXT2o5Mega7dFwJQfvbmQWv5impU YPJ6TqDnoQcpaOU7zOOb0nUiB3EN8JCQqTFjaSwMdTNrzhzWhlYSUSjxNl7nbJdfrXGbqE NCzpDUgI8qL2c/HQwU8cMECjtlAUHh5/3nH0W93eqxaP9qncR+Q6EGskRl5+wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765636704; a=rsa-sha256; cv=none; b=VwZjXtSed8kctDbCBLCnIKKRk7CwRt5GiWCH8E9VIxXeoJz/N34dQIFbHOmPAgT3QYvE5L jz6upfk5mPy87WDjxhuUZNUgAasL/BH8ziy7rql4pWow0KfH/hAX+f8VYZ8+YMpHFYfqRE nPZch16rFjdPYnc+hk+X8UMyANqM1kZniujwBc8iQ59Z5wY3o93IYHtBeMyLBcK0u7QzdQ AYAgv6pLV1r5PuMN1zGKZ0HlSKuFIKb2DvMHbmftOyqxLIG5ATMp3uMXDlm8NoAzDs/Bvu 2mjp4i2a89PFMhT+Rz1bibBotBRSa+Ucnjr9GBJh2ZHZcjlganJ8yu+u/8Ujjg== 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 4dT8803X1dz16cq for ; Sat, 13 Dec 2025 14:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 327b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Dec 2025 14:38:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 2f29d0f3e6d2 - main - mtree: tests: Import NetBSD's mtree test suite List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2f29d0f3e6d25599c188c94bf1e395d9cbeb2a4d Auto-Submitted: auto-generated Date: Sat, 13 Dec 2025 14:38:19 +0000 Message-Id: <693d7a5b.327b7.650dbe8c@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=2f29d0f3e6d25599c188c94bf1e395d9cbeb2a4d commit 2f29d0f3e6d25599c188c94bf1e395d9cbeb2a4d Author: Jose Luis Duran AuthorDate: 2025-12-09 15:45:01 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-13 14:37:20 +0000 mtree: tests: Import NetBSD's mtree test suite Manually import latest mtree test suite from NetBSD. MFC after: 1 week --- 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 }