From nobody Wed Feb 18 00:26:03 2026 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 4fFy3b6JNMz6SM4K for ; Wed, 18 Feb 2026 00:26:03 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFy3b4tyXz3Gmd for ; Wed, 18 Feb 2026 00:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374363; 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=X1kiV/KmBeSkHUgxKkZTGH/HzLWBnUwowNrAXXmhIkM=; b=K3CGNVS3YJh9JgmfvUf5xTEAtHuJp7FD5GcBScrilaphrNu+OjRgGc/vFw3Mrg+kvOls/W s24W+fESlUJXcMdSIx1hOL+gUXUnLMaYbYdjyP2dQow1r6Prmy6M+g1DDGw7YvVOO4j1qS NBlY06uyo8VxnBAQNfPFhuXNikuK1otG/AytcPwLfQ/vG5k87348s3W9J8OgOEWlltPz2b RmHDDDVdoj63kBIOICqHrc6nnogL6PoqJbRjoQ4B5AMeagwsaOmbYXPvgjckJuRxsyr5DF LiI+zmGZtnllTI779zZI1mhqHtlrtcpX/rpoPiGUbi7evF5yQQKMFWeEL3q81A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771374363; a=rsa-sha256; cv=none; b=BOh8v5cMjsIooDQ4fXQA2Bad49kegjDo184mSYcrRjpibbklMrhmMhNL0rBIy4pkahuask SYXRzqGBLc5U9NBGw+OeObN1f8ArE5KHrTno2pRTo2i7m7Zd9mEJRq2VYGWNDIhTa5GHJf otM2d2JhqJMXnLDGLvoio5VucEuj7FppX0jmYjNyq4u8KAmJC3IRlqTA5VCeX5zZPRZXzZ tzpyxbljIKJF5RQHqBUFxYWyQQEqxpOUZmyqXUPkRMtv1OaIosswGV/8DFY1aunMF0zoZH jLDSKyBvccPnxZ+3hD2DaEqiDvCXEUMZFhkcqHCmYTBUCVOWJ8D8AlHfLuy5cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771374363; 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=X1kiV/KmBeSkHUgxKkZTGH/HzLWBnUwowNrAXXmhIkM=; b=mP1n8mbx7gP+tY6tXQnp4XIKmfNmaZqFk65VXOyGlnHxomYx/mLwYU2yFCaUCIaoDVm94A 14xKOh5S9Vo8oPijrOx4NiwQsl/rMXc4QYJICuQT9IBVpRhX8TNWPBhUixnRd+3CnK2xgf T5t4OvMlPabgXUkiMdW7F5qIJPky/5SDYj1zFr/lZIORxlWinXK/l1Qbc2cfVoOjOrmrvi zhK2IdwzKNkNctQaTM0w7sWUKQdHzdc709PZq88y+0LCC/UOzG/laZxPB1jT5CYbJog90s 9GS5gOdLNURDvW5+/WTocS/h5yhpdzaw9BM8yJf2HpBgPV4NzrOksNaVArDuLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFy3b4FxSzZCy for ; Wed, 18 Feb 2026 00:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d2cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:26:03 +0000 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=B8rg?=rav Subject: git: b9a6888b37cc - stable/13 - diff: Tweak recursion tests 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: b9a6888b37cce03a5a04f376a1d782498f4352af Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:26:03 +0000 Message-Id: <6995071b.3d2cc.2845ec8c@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b9a6888b37cce03a5a04f376a1d782498f4352af commit b9a6888b37cce03a5a04f376a1d782498f4352af Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 00:21:16 +0000 diff: Tweak recursion tests The -r flag is not required to compare two directories; it is only required to compare them recursively, i.e. descend into their common subdirectories. Adjust tests that use -r needlessly, and adjust the dirloop test to verify that these two cases remain distinct. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55262 (cherry picked from commit b2532432971fbd9339a9a49eca1b532978bb6d48) --- usr.bin/diff/tests/diff_test.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 9914cdcf84c7..0fcd5b02c29c 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -1,4 +1,3 @@ - atf_test_case simple atf_test_case unified atf_test_case header @@ -170,19 +169,19 @@ brief_format_body() atf_check \ -s exit:1 \ -o inline:"Files A/test-file and B/test-file differ\n" \ - diff -rq A B + diff -q A B atf_check diff -rq A C atf_check \ -s exit:1 \ -o inline:"Only in D: another-test-file\n" \ - diff -rq A D + diff -q A D atf_check \ -s exit:1 \ -o inline:"Files A/another-test-file and D/another-test-file differ\n" \ - diff -Nrq A D + diff -Nq A D } Bflag_body() @@ -204,9 +203,9 @@ Nflag_body() { atf_check -x 'printf "foo" > A' - atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE - atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A - atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 + atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE + atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A + atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 } tabsize_body() @@ -298,6 +297,9 @@ dirloop_body() atf_check mkdir -p a/foo/bar atf_check ln -s .. a/foo/bar/up atf_check cp -a a b + atf_check \ + -o inline:"Common subdirectories: a/foo and b/foo\n" \ + diff a b atf_check \ -e match:"a/foo/bar/up: Directory loop detected" \ -e match:"b/foo/bar/up: Directory loop detected" \