From nobody Thu Oct 09 12:21:35 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 4cj8B76Kxgz6BqJp; Thu, 09 Oct 2025 12:21:35 +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 4cj8B73DyWz3RCk; Thu, 09 Oct 2025 12:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012495; 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=BT7AMxbHGW5n3c+XfZhWmeq9oTeSzDfRArwlrXYXaGI=; b=gD6TzAEFUAXdZtgvCHIpQND/rYHMG1sMzv6w1SdZD56QKQw9l7fg+ZfmDoLBjMyBVU7BrK ZTEfRVFpd75r6dohsx7BSwjRCzCX8jLbwQPC3PWV6AgD2ywJNzJwR+cEwtZ+gNUbZ0amYq wt1/EPLjkGp/lxmzyFXkfEy2fYLFQiJRGaVtZvAlZPmTfjRf9xXv4GVj8FqTbVRJ59UF63 Nec7o2Idel65W8QMqAyz/7J4iUBEMqiIGFHrwLCUAue0JQhtwhUaEfs6pn1U+pSWULyeqU CLf6MN3j07VrbwlnTBGxydRfdqfLdXgF9CY0hCvOGLZRENWClFUe70IlSwtI7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012495; 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=BT7AMxbHGW5n3c+XfZhWmeq9oTeSzDfRArwlrXYXaGI=; b=ou8UKTiQzURmxIo3KzoYIxfayIf2OTfOOtP6q4vSlM3/bT1cqdBDMAU87juJW7NfuMPlRj R4xlK8I7cHciMn9Dsg8cChNPAFe2XstKnlv/ot6NTTYZlo3SJQksYN8fD+0eXwR3bIIbHv BSFTtRAhh4D3SwIgEzy+f7vPrJnO9jX6zJoF8N3qHagCUAJx29+l3JUj5Dwwk35Rg//Q9D tUGsXk1HospuB+x/LiSkGoLQSB3zd9IROTwYw4oHzSIDOgc4jvDHV3ftiOrGH8rEPlsu+I 3FbB8LTz+MirNtSgFx4zmAuKvwD9ipKgfd3CLr6aqdZsQ++YFrSjhclvSnriuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760012495; a=rsa-sha256; cv=none; b=X0vaJ+xG9MdvDky/s5GnWprGCj8BWVmJLGg/pKvEdvVNRSg2BBTYq/zv561F6R0pR2FRcL 7YeHrwDHBUMY0IEbyDv6xYmtF29/JfciWc1u/53otqDX4icDvH6oCBNiRgq+AnYDrV7Uw1 JtZ6ISpk6n08m9MwzAGVN9yb+fAVNjHp2lNg05U6AopKK62A4EoIraGoWTVIsdOIZXLHE4 LKd66X6n5wXFLhmjGgCHBasyE2+E/EHuKQSxAXlcspdv4JsKafFZ+gzU+fjUkpARppMfOV sGy6azf/DCa3kWgfdRTxi+/JYXVrwTetzXaBTWQR4/67pWxR45prMj8321ovMA== 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 4cj8B72pHBz2Y1; Thu, 09 Oct 2025 12:21:35 +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 599CLZ3G047137; Thu, 9 Oct 2025 12:21:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CLZVK047134; Thu, 9 Oct 2025 12:21:35 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:21:35 GMT Message-Id: <202510091221.599CLZVK047134@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: 74fa49276487 - stable/14 - cp: Simplify sameness checks 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 74fa49276487afc174ff3299a034e063cd947399 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=74fa49276487afc174ff3299a034e063cd947399 commit 74fa49276487afc174ff3299a034e063cd947399 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-07 16:23:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-09 12:20:52 +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" }