From nobody Thu Oct 9 12:21:33 2025 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 4cj8B628Fzz6Bq7F; Thu, 09 Oct 2025 12:21:34 +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 4cj8B55WTPz3Qns; Thu, 09 Oct 2025 12:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012493; 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=iwvmhR5CQpSDvV4cW/Bzr+S5XYYq5xadlEtq1v8YlEg=; b=ElwtCyCpR9wha5woOaEEUWLgygGVqOY929y0bMFW7ChyQ1XSrYOUsTUDcKleGhfpf7tW6h ktYFTXeZWE8LtF9bygyQLPqI6UKMhCmqhM4vxcv6NuhO1xtpJ9c/uclCXhl61yoSxHAfb2 b8Q+0YJzuhCC4cjKZCj+K+UUc5ONyf1m/uuAAeV4puGxADkeh7Dk0MCmU+qQYw6mAsMlTi cwe/yWICAzmhHid7s6ER2uZxRFqaLnucvKCwGKYin9QDRIInEavVlSvLJqBuidFwaYAb/U GUhv2JQp8bKVepxJQHRokctHGL7U/dgtwRMeolKqDEzs+TsHcv+xEHSb9O1PFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012493; 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=iwvmhR5CQpSDvV4cW/Bzr+S5XYYq5xadlEtq1v8YlEg=; b=A8jlMfxjzYmrZjmC3OO4Vd/J0VbxNV4+WNCQSuA7cRZWNyGketi5GLKSO8qxQIJ2GRYj7h v88bMlLaxfhP7JQAPsT6Z/z+1V7Tve6mU9fudwku27tGJw8o8LqLBYzgMStgiGOSpjX1mG WxHouDzB7lSZynMi9bayWeLCBsGIqiV/ZvHoY6eReEtTi+611P1sh7foBJrjl9m3WjWISZ bFqShttMQyXaKwzpOtWGmv4EAkgeTKIUsvLfKkQ99XS+Uh4MQdQS3o9HC4RlEPO1eU0geN Grh2rU3oJgYfcvw/9z0nPLs+8o/8CvYvFeO8ZxDy7LC0qhRk7hhI3RJl8UAcmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760012493; a=rsa-sha256; cv=none; b=bQlB8MzxAIBxiX0Uy2kVu/dy6amd4+2aln3Ie/MdSTJz4KHxJWrvTYfjHcGKyPbXascPJ8 Nod5lDMOwVQRQPw3ARzzTipctI3aOtoOcSA3dH/OfW+z9e83XyKJVcouoKrKwoirl5C4of lMti8aUjVdBFuLgQMvPjtVi7Cdq/jbedWs0Q2T20Mfth7ckLGwNtX5a4zFvFH8CWfIVpLg Z9DQZNqiDr8FrFqx4o7+xyzfZZhindLdGEuPVsL+Jjt2DkXRlpLvyt+32iA1ahkxfUAizL jED3YRWETfmrT0gcyNEIM/bj62DW1UgN50ygE+MpjVndtfLkvES13D2zGoKyVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cj8B54wDbz2DG; Thu, 09 Oct 2025 12:21:33 +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 599CLXnm046994; Thu, 9 Oct 2025 12:21:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CLXDP046991; Thu, 9 Oct 2025 12:21:33 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:21:33 GMT Message-Id: <202510091221.599CLXDP046991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b0c147af0862 - stable/13 - cp: Simplify sameness checks 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b0c147af08621b476f5b50905ecf13ba1124228f Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b0c147af08621b476f5b50905ecf13ba1124228f commit b0c147af08621b476f5b50905ecf13ba1124228f Author: Dag-Erling Smørgrav AuthorDate: 2025-10-07 16:23:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-08 11:44:39 +0000 cp: Simplify sameness checks Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52926 (cherry picked from commit 95de78614a57733807c28c05125ed0636309d88b) --- bin/cp/tests/cp_test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index 397c06d75bbb..d3d1d6e42c93 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -74,7 +74,7 @@ hardlink_body() echo "foo" >foo atf_check cp -l foo bar atf_check -o inline:"foo\n" cat bar - atf_check_equal "$(stat -f%d,%i foo)" "$(stat -f%d,%i bar)" + atf_check test foo -ef bar } atf_test_case hardlink_exists @@ -84,7 +84,7 @@ hardlink_exists_body() echo "bar" >bar atf_check -s not-exit:0 -e match:exists cp -l foo bar atf_check -o inline:"bar\n" cat bar - atf_check_not_equal "$(stat -f%d,%i foo)" "$(stat -f%d,%i bar)" + atf_check test ! foo -ef bar } atf_test_case hardlink_exists_force @@ -94,7 +94,7 @@ hardlink_exists_force_body() echo "bar" >bar atf_check cp -fl foo bar atf_check -o inline:"foo\n" cat bar - atf_check_equal "$(stat -f%d,%i foo)" "$(stat -f%d,%i bar)" + atf_check test foo -ef bar } atf_test_case matching_srctgt @@ -247,7 +247,7 @@ file_is_sparse() files_are_equal() { - atf_check_not_equal "$(stat -f%d,%i "$1")" "$(stat -f%d,%i "$2")" + atf_check test ! "$1" -ef "$2" atf_check cmp "$1" "$2" }