From nobody Tue Jun 10 06:08:57 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 4bGdf22Ydpz609ws; Tue, 10 Jun 2025 06:08:58 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bGdf20JP2z3s3M; Tue, 10 Jun 2025 06:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749535738; 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=KVplNptTV/lYZerrnaX9i8VzZFsXP3gG3lgpMylVUbQ=; b=FYN5NzNfdkuFQHg60rR1/GuIL2SSbzIx2bQRCOztwWUq8eeJIvXbB8ZAJUFSE/6czUD2OO 7mmFxWstTdOYHh253bAaHoDZPpq2RbEPovNCd+Kxh9Z16sbd4dw0vzo9V9yQppySmWfi9y BhY2v3CekeVNuhrrndoKU84QgxtikKxq30wYzXXrm3AVK1Q4bUKF83fAyNzpGpJXxWZuaj eki+wcOgylhScBTMKWyzEu1pyCVqaE+YsAkyvU177G0fVNoTjtrL5VTxLc5JDEGLiXhy2I MiLlj/9O8BDTmXXl+PWA3A21tU9iSUdlLk2o21A2PVrU0CHfxZ3eZNvhdctFFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749535738; 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=KVplNptTV/lYZerrnaX9i8VzZFsXP3gG3lgpMylVUbQ=; b=OqFrPmP5DZyxHGNjJQ/BZ6FrdkNlkrOFxmEajm0oeez+/nA5gxEG+GiVdYIWd6f89CDUWj BtS1l+X1cWXnvL1LswvfYcYHX5U0V01jgg2BdgPCoNr7Eweoy38AfoCBXosSc7xiY/MgD9 QP1thbf5lTeWcpF88sUhNIXl3NOjtDxF++CtR07QNVOq2R9azjSGR4vPgiZZi+mL+O48KV 4TOW/M5FPR7FrvCpXbv89rO7i3XGc4R85E8NPqYOIQej+8tuqm4Fv8pEufGfmAzPrqXZEf Th8z/IR0bw2AqkH9DzP2GPeV4rHB5QB1srWmJrTnnpfdftFVBaTvd6twsXrcbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749535738; a=rsa-sha256; cv=none; b=G6smqRMz+URP5bqthDYFtIZH/OZvkJ/gscBnZU+mxKcOGQocKYVLHLMzcpxnZwC1ypQioj klW5A2jOpFmhw922j+KEsHSNrF30BoCsH8RgZI6G2VtJbex3UB4q1WL7wh0DQLAGAZMbUs LdavixA3lqhCiJzPB8WjSISzYlKqX69ZkZZ6fLYx0XgJRfkZSURnqJ+j29QzT+c/JtxXng dJg2lODyz5jJw2aOZ+dl35GsInFW1KWc34/CmgDDbyyNYnr9vjkHfl6M6xLI2EcaHKmXCQ jQbtSaoLDvLAQKWTmTdVE+rbhTCOdmJleUxKHIJjC+VcgOb/86IZr10dlFa7Sg== 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 4bGdf16vM7zD2q; Tue, 10 Jun 2025 06:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55A68vEd004771; Tue, 10 Jun 2025 06:08:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55A68vgl004768; Tue, 10 Jun 2025 06:08:57 GMT (envelope-from git) Date: Tue, 10 Jun 2025 06:08:57 GMT Message-Id: <202506100608.55A68vgl004768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: acded1a4c42a - main - cp: Improve -p flag tests. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: acded1a4c42a6ce713a85b323ec39af86cf17679 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=acded1a4c42a6ce713a85b323ec39af86cf17679 commit acded1a4c42a6ce713a85b323ec39af86cf17679 Author: Dag-Erling Smørgrav AuthorDate: 2025-06-10 06:08:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-06-10 06:08:51 +0000 cp: Improve -p flag tests. In addition to verifying that ACLs and flags are copied with the -p flag, verify that they are not copied without it. Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D50714 --- bin/cp/tests/cp_test.sh | 56 ++++++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index 5e9a1899ff75..f06238c89367 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -188,18 +188,22 @@ pflag_acls_body() ! setfacl -m g:staff:d::allow dir/file ; then atf_skip "file system does not support ACLs" fi - atf_check cp -p dir/file dst - atf_check -o match:"group:staff:-+d-+" getfacl dst - rm dst - mkdir dst - atf_check cp -rp dir dst - atf_check -o not-match:"group:staff:-+D-+" getfacl dst - atf_check -o match:"group:staff:-+D-+" getfacl dst/dir - atf_check -o match:"group:staff:-+d-+" getfacl dst/dir/file - rm -rf dst - atf_check cp -rp dir dst - atf_check -o match:"group:staff:-+D-+" getfacl dst/ - atf_check -o match:"group:staff:-+d-+" getfacl dst/file + atf_check -o match:"group:staff:-+D-+" getfacl dir + atf_check -o match:"group:staff:-+d-+" getfacl dir/file + # file-to-file copy without -p + atf_check cp dir/file dst1 + atf_check -o not-match:"group:staff:-+d-+" getfacl dst1 + # file-to-file copy with -p + atf_check cp -p dir/file dst2 + atf_check -o match:"group:staff:-+d-+" getfacl dst2 + # recursive copy without -p + atf_check cp -r dir dst3 + atf_check -o not-match:"group:staff:-+D-+" getfacl dst3 + atf_check -o not-match:"group:staff:-+d-+" getfacl dst3/file + # recursive copy with -p + atf_check cp -rp dir dst4 + atf_check -o match:"group:staff:-+D-+" getfacl dst4 + atf_check -o match:"group:staff:-+d-+" getfacl dst4/file } atf_test_case pflag_flags @@ -211,18 +215,22 @@ pflag_flags_body() ! chflags nodump dir/file ; then atf_skip "file system does not support flags" fi - atf_check cp -p dir/file dst - atf_check -o match:"nodump" stat -f%Sf dst - rm dst - mkdir dst - atf_check cp -rp dir dst - atf_check -o not-match:"nodump" stat -f%Sf dst - atf_check -o match:"nodump" stat -f%Sf dst/dir - atf_check -o match:"nodump" stat -f%Sf dst/dir/file - rm -rf dst - atf_check cp -rp dir dst - atf_check -o match:"nodump" stat -f%Sf dst - atf_check -o match:"nodump" stat -f%Sf dst/file + atf_check -o match:"nodump" stat -f%Sf dir + atf_check -o match:"nodump" stat -f%Sf dir/file + # file-to-file copy without -p + atf_check cp dir/file dst1 + atf_check -o not-match:"nodump" stat -f%Sf dst1 + # file-to-file copy with -p + atf_check cp -p dir/file dst2 + atf_check -o match:"nodump" stat -f%Sf dst2 + # recursive copy without -p + atf_check cp -r dir dst3 + atf_check -o not-match:"nodump" stat -f%Sf dst3 + atf_check -o not-match:"nodump" stat -f%Sf dst3/file + # recursive copy with -p + atf_check cp -rp dir dst4 + atf_check -o match:"nodump" stat -f%Sf dst4 + atf_check -o match:"nodump" stat -f%Sf dst4/file } recursive_link_setup()