From owner-svn-src-head@freebsd.org Mon Jul 17 17:50:51 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2882D9BE49; Mon, 17 Jul 2017 17:50:51 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C6E069BB1; Mon, 17 Jul 2017 17:50:51 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6HHooK4071939; Mon, 17 Jul 2017 17:50:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6HHooAF071938; Mon, 17 Jul 2017 17:50:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201707171750.v6HHooAF071938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 17 Jul 2017 17:50:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r321077 - head/usr.bin/diff/tests X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: head/usr.bin/diff/tests X-SVN-Commit-Revision: 321077 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jul 2017 17:50:51 -0000 Author: ngie Date: Mon Jul 17 17:50:50 2017 New Revision: 321077 URL: https://svnweb.freebsd.org/changeset/base/321077 Log: Add some tests for brief (--brief/-q) format MFC after: 2 months MFC with: r321076 Modified: head/usr.bin/diff/tests/diff_test.sh Modified: head/usr.bin/diff/tests/diff_test.sh ============================================================================== --- head/usr.bin/diff/tests/diff_test.sh Mon Jul 17 17:36:04 2017 (r321076) +++ head/usr.bin/diff/tests/diff_test.sh Mon Jul 17 17:50:50 2017 (r321077) @@ -7,6 +7,7 @@ atf_test_case header_ns atf_test_case ifdef atf_test_case group_format atf_test_case side_by_side +atf_test_case brief_format simple_body() { @@ -109,6 +110,23 @@ side_by_side_body() diff -W 65 -y --suppress-common-lines A B } +brief_format_body() +{ + atf_check mkdir A B + + atf_check -x "echo 1 > A/test-file" + atf_check -x "echo 2 > B/test-file" + + atf_check cp -Rf A C + + atf_check \ + -s exit:1 \ + -o inline:"Files A/test-file and B/test-file differ\n" \ + diff -Nrq A B + + atf_check diff -Nrq A C +} + atf_init_test_cases() { atf_add_test_case simple @@ -118,4 +136,5 @@ atf_init_test_cases() atf_add_test_case ifdef atf_add_test_case group_format atf_add_test_case side_by_side + atf_add_test_case brief_format }