From owner-dev-commits-src-main@freebsd.org Mon Jan 25 19:39:02 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3A3854EE800; Mon, 25 Jan 2021 19:39:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DPgCp1FXhz4vgy; Mon, 25 Jan 2021 19:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1DD291C095; Mon, 25 Jan 2021 19:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10PJd2Gq079172; Mon, 25 Jan 2021 19:39:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10PJd2fG079171; Mon, 25 Jan 2021 19:39:02 GMT (envelope-from git) Date: Mon, 25 Jan 2021 19:39:02 GMT Message-Id: <202101251939.10PJd2fG079171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 13860e71eb50 - main - diff: add a test case for failed -s option MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13860e71eb501f498a2263f44ea9244f6830b61c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2021 19:39:02 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=13860e71eb501f498a2263f44ea9244f6830b61c commit 13860e71eb501f498a2263f44ea9244f6830b61c Author: Baptiste Daroussin AuthorDate: 2021-01-25 17:40:12 +0000 Commit: Baptiste Daroussin CommitDate: 2021-01-25 19:37:58 +0000 diff: add a test case for failed -s option --- usr.bin/diff/tests/diff_test.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 7ee88d1fe607..6da2bbaea34d 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -15,6 +15,7 @@ atf_test_case Nflag atf_test_case tabsize atf_test_case conflicting_format atf_test_case label +atf_test_case report_identical simple_body() { @@ -226,6 +227,15 @@ label_body() -s exit:1 diff --label hello --label world `which diff` `which ls` } +report_identical_body() +{ + printf "\tA\n" > A + printf "\tB\n" > B + chmod -r B + atf_check -s exit:2 -e inline:"diff: B: Permission denied\n" \ + -o empty diff -s A B +} + atf_init_test_cases() { atf_add_test_case simple @@ -243,4 +253,5 @@ atf_init_test_cases() atf_add_test_case tabsize atf_add_test_case conflicting_format atf_add_test_case label + atf_add_test_case report_identical }