From nobody Tue Oct 07 16:24:12 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 4ch1g04NXZz6BZJ3; Tue, 07 Oct 2025 16:24:12 +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 4ch1g02FFxz3dWR; Tue, 07 Oct 2025 16:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854252; 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=h65IpwfHiZE8uurW4xpuQSeAHvj7e34tkZjZNr8J0Bk=; b=I2f/QtQyC5+F6gL7d5J5Dgq2KQ5+kzNSW4FEdGF2fA3rwy2JTkeO1GnnLBX0EfcrgxFlRA u8ewi8TQXiQ9jzRFNePmM1/Qek5vP6uDQBZyj9ETvNYI+TIyWmUu0OJa660l5LI1jHKxYb H6iuCaus8TdHu6Bg+YwgAqg0Kr1u8wwoakq1yB3DHVUnzhwgi/Bnyavr+cldvrAoECGzrC dq4PLgP0jsdM6iM++Q2PuM38bXrk9qsn43kTZ88XoqZiOfiZAToQEc2arTf3Kc9AxaNtDT K8QbUI0onzJbuDY4CPEKs3kzxf7NQq+I2i5QUQxwkbYs56neX2Wm9G0r+6vefg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854252; 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=h65IpwfHiZE8uurW4xpuQSeAHvj7e34tkZjZNr8J0Bk=; b=esmvrUgbyvVlaHPuSFkVQckFNMtRy3TG00hbEgnCide69/FPvap/yODabfCljIQYh9dsFY OlkVOJ7t5n5qAzfOQ+mgm+ioCWhEGJhS442izQRoOJR0GHJ1nbikPM8qdN1xzLtLPxtg7u sJs3jjaevAJrEe4HUsZCIRyNfiZtX4CLIxmCpzAfeWZGnjME99Avs01nS8Pp2R9DZiEjMt HPIthmJPoSH4MtnVEooCwjDeX9mAYnA9XxrWUaDyPFgqVDZmUhU/Z4cfDRVo/YtWR7wFmc 6MKIssUYQbFNu/DQ+QKh3IlP1uxxdZpaILaVoOuB4rK9ArZvqUCUWGOgm93RHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759854252; a=rsa-sha256; cv=none; b=DljHdFXywyrj5QCA43Eg2EeHlAXxhTSNQnLV+1qBsnK+8OvRuLZV441yG7uGbLDGG3Z9Al BkS/idk8w2GofcRBMobvsfTRYLXcRUq6TQEaHei+aeCTW2/mMDL+/UxM+AyOGQMok5d0CJ 4yPd3fz8sj5EQpp37OyEv50d/Uxh7B680BD2xDfoFdqATNrZ7/oW3owmXLH2n0bhSk4lcy oXsC6HEmEc6Zz7YhlPlc04eqn5pxD0Yd2R0wnFOYPjoNoFEUEmJ8+HzNHVBaRftIYQdjXL LLkwNjGFd4acCI5e8P2GVcM7tOkm0wydHjPkoZTU8EQESW1AxYgBNCpmBXYQsQ== 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 4ch1g01mt4zt8R; Tue, 07 Oct 2025 16:24:12 +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 597GOCZM077541; Tue, 7 Oct 2025 16:24:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597GOCFM077538; Tue, 7 Oct 2025 16:24:12 GMT (envelope-from git) Date: Tue, 7 Oct 2025 16:24:12 GMT Message-Id: <202510071624.597GOCFM077538@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: 95de78614a57 - main - cp: Simplify sameness checks 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: 95de78614a57733807c28c05125ed0636309d88b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=95de78614a57733807c28c05125ed0636309d88b commit 95de78614a57733807c28c05125ed0636309d88b Author: Dag-Erling Smørgrav AuthorDate: 2025-10-07 16:23:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-07 16:23:58 +0000 cp: Simplify sameness checks Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52926 --- 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 fdf50d042f0b..b637f862b7d3 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -90,7 +90,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 @@ -105,7 +105,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 @@ -120,7 +120,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 @@ -389,7 +389,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" }