From nobody Fri Feb 13 20:19:32 2026 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 4fCNn11KLYz6RlXS for ; Fri, 13 Feb 2026 20:19:33 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCNn05pKMz3MkW for ; Fri, 13 Feb 2026 20:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771013972; 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=O9xeOvlwq53kj/FRNCa/M1CjigxedZn1UGFgZnHOsUw=; b=EnXh1pO0w0lk859zI9CMWUTMETFIDcT6UMF00Yz38F3tNI3RX8cGrwYVfMLoXpUDwIJ0dz D/TCe65rt2oKlOjJBiliK/BauzMKctVxDjfLXGFMPL3bmF5JWe7KOLFzgCJozo/x7vVAPe NYyoWY5Rwm37GQ1hBrqAPcqiMWMf3GOKi3HaPb8F0+iRo90ALLt4GSBUHjTtbhX9YCMkrc B2aCFnq6ZNXnMHsHBHTvXH3o0b93wdQENXqHwV/DSUxfbp7kd59bhxjvfjcSdBT2MuyTwH +Hw1ljP0DOl+dRBZixXpJ3SFvRua9Y3zveuH5xNLFO+AQiQAkkPIaRisjbnvRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771013972; a=rsa-sha256; cv=none; b=pPwmhESE+IbQPtay3+6tUI2jXQ3SMJa0hresCjTmMupfLk39gqTPjuTo2E+zDm0q9Fcktf kPSm6d0PrAuDYCHOJsKikrXR90GQ9Ol64e7jYeBKIjitMoMwZ5gNsc6QgS0WT9/zKfABLy hBYCO1FGkLTZzHJkzIWfezMvwaIcIJ6B3ppP9JTbu0dbQ3hd9Xwpz9QHfUW6Y67JOs+yIm lkvXy4aDGx04xhmmzhOQVbXgdfU0qK+y/DPy4Qg/8Y+j26OZEwSlXIPQtRO0XZ8PL8NgV/ ccAWUIbc0cVbgBdo6dozpeXgVKqHaZl02B37EAJ62RNTF78OnxQEGb+p+zjsEA== 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=1771013972; 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=O9xeOvlwq53kj/FRNCa/M1CjigxedZn1UGFgZnHOsUw=; b=NYKu00VUIt3MfhHTJyO1qU/4lHZcfPrXqvJvsCcOFUXnC8/1Gtqr+Fra/CADN19kZpXdAO fRTebS3z+Hi9rTWLnGFZC1YGAbW2Ya1mbph6F4KOGru+lajUHC6gGhrj6+RktDaOqfsjah 0V9TY4sGs0XcKcXQWjqsFBatCvwl2Y488o5gvAqzXPITBSyOQlgbQXhuh1L1cNE0dEQ3K/ TmhJMqjGPeeDnoPg3TK6aBHPnmfxRluV6WM8LnwnVio9CKKh3WKaA4CUt5Hj77q3IVkffm n+18Iv8tZFQUDvD16wlyU+ZDtMes6/PucNsKG6xPxF6xfEhj5ImzxVNOgBy56g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCNn05PFhzcm1 for ; Fri, 13 Feb 2026 20:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44e85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 20:19:32 +0000 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=B8rg?=rav Subject: git: b2532432971f - main - diff: Tweak recursion tests 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: b2532432971fbd9339a9a49eca1b532978bb6d48 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 20:19:32 +0000 Message-Id: <698f8754.44e85.e3b0f75@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b2532432971fbd9339a9a49eca1b532978bb6d48 commit b2532432971fbd9339a9a49eca1b532978bb6d48 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-13 20:19: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 --- usr.bin/diff/tests/diff_test.sh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 3afd12355a80..872103b24cef 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 @@ -191,19 +190,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() @@ -225,9 +224,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() @@ -339,23 +338,23 @@ noderef_body() atf_check ln -s $(pwd)/test-file B/test-file - atf_check -o empty -s exit:0 diff -r A B + atf_check -o empty -s exit:0 diff A B atf_check -o inline:"File A/test-file is a file while file B/test-file is a symbolic link\n" \ - -s exit:1 diff -r --no-dereference A B + -s exit:1 diff --no-dereference A B # both test files are now the same symbolic link atf_check rm A/test-file atf_check ln -s $(pwd)/test-file A/test-file - atf_check -o empty -s exit:0 diff -r A B - atf_check -o empty -s exit:0 diff -r --no-dereference A B + atf_check -o empty -s exit:0 diff A B + atf_check -o empty -s exit:0 diff --no-dereference A B # make test files different symbolic links, but same contents atf_check unlink A/test-file atf_check ln -s $(pwd)/test-file2 A/test-file - atf_check -o empty -s exit:0 diff -r A B - atf_check -o inline:"Symbolic links A/test-file and B/test-file differ\n" -s exit:1 diff -r --no-dereference A B + atf_check -o empty -s exit:0 diff A B + atf_check -o inline:"Symbolic links A/test-file and B/test-file differ\n" -s exit:1 diff --no-dereference A B } ignorecase_body() @@ -366,7 +365,7 @@ ignorecase_body() atf_check -x "echo hello > A/foo" atf_check -x "echo hello > B/FOO" - atf_check -o empty -s exit:0 diff -u -r --ignore-file-name-case A B + atf_check -o empty -s exit:0 diff -u --ignore-file-name-case A B } dirloop_head() @@ -378,6 +377,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" \