From nobody Thu Oct 9 12:21:34 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 4cj8B674Frz6BqGB; 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 4cj8B63yvZz3Qlf; Thu, 09 Oct 2025 12:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012494; 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=w+JO2QsMHy/3L+Y9T1msZzScDHi2NUwTmf3RPz/C2cI=; b=mJ/CxHBBOSJ+0KMN25of7q6j3phStQvq6KjoitQsME37H3Pa9MtP6ssOWtU0ayYXs8JBoC wmRaBwdl/PRnTgUK/GKav8XCcdBaIQdh53dRy63AVtfy4WeKWFDoRVBLWSE2c+FQ2wQWaC /t6YQfy4CqeGOOXmK2KUqnrEsJQiae1KddNq4YP4GwMEzpClwmbiP3AHFm4kKHKbA4zu9W NNfVkG4ECKrVINMuqo8+zfOOydHig88/bqxVghy/pmtiwdOtWF0S+AzrT2xWO6XCCjT9wE 7wFTkWiawQmQFMF2rqli3kpJA/RipRzMEwvM6p0c41WCyV5l3uYYGhyB7EtI+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012494; 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=w+JO2QsMHy/3L+Y9T1msZzScDHi2NUwTmf3RPz/C2cI=; b=uRCKJLEehRdYAfbA+nXTg0HBLkRFd16MCvtgfK5UXPSLe/FxZQiJKQkVUynO9sMBD64xUn PCBogKeDpR/SU2C8rfgRSWWUQuvtEFGxfRlC8koQsa/TjZ8nBo089EKt0w58Jt4TeDkymE AgQs8j3tRkjQGbRoEe1AHhy46BD8STpO1h1ZhIutSG2qUHAiaKJHHjG+kolAxLQdyF8j65 5/KS7oItVlzZl4vqVrKIErPRYcP81x6wy6NzgQnG1qTqy29kNNzsp7jvn0DJtqYEMnNAZc R96PuLm/F6Gn7r5fHeTp9IG0OHxiU9rLo4syV65OcFeeKtj6oZR9nGQGXB75Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760012494; a=rsa-sha256; cv=none; b=wB98VHXmdDYrxJatTomm7k43E4kSD0Q9wKLAa/ofRBPU8akv35nY3SRDOwjoakZOrwc8lq Xkf65cQ8Uhq0vgNJpSDJY7QaM137HlwpQ0GNbU8UUxPRf8M8IJ8ggxMIVPaKCQnz+u1hlO rQrF81Q+PZPSZKet1N3jGJklZuLxd+KihyvI5Z2XkPPlvIO+nc2dNlppRByQV2+1BsygTW PEqclD+PNihcRrt4gTnnfBLFeipbnEL+9uGZkOf7+gjEtbFBYmyTPqIstczJzy6n0M6IFZ SopKSUW+xP/O010QcjamJFShoLPYPy2bxEKo44Zd60SlTkdpeS6URD7GEvoYNw== 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 4cj8B63M3Bz20C; Thu, 09 Oct 2025 12:21:34 +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 599CLYdO047064; Thu, 9 Oct 2025 12:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CLY7G047061; Thu, 9 Oct 2025 12:21:34 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:21:34 GMT Message-Id: <202510091221.599CLY7G047061@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: ef8420744e72 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: ef8420744e72d4ea28fc0c4298bd41b45ad4d09f Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ef8420744e72d4ea28fc0c4298bd41b45ad4d09f commit ef8420744e72d4ea28fc0c4298bd41b45ad4d09f Author: Dag-Erling Smørgrav AuthorDate: 2025-10-07 16:23:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-09 12:16:04 +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 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" }