From owner-svn-src-head@freebsd.org  Mon Jul 17 18:07:55 2017
Return-Path: <owner-svn-src-head@freebsd.org>
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 1F343D9CAC3;
 Mon, 17 Jul 2017 18:07:55 +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 E2D4B6A83C;
 Mon, 17 Jul 2017 18:07:54 +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 v6HI7s4x078335;
 Mon, 17 Jul 2017 18:07:54 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6HI7sax078334;
 Mon, 17 Jul 2017 18:07:54 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201707171807.v6HI7sax078334@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Mon, 17 Jul 2017 18:07:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321079 - 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: 321079
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jul 2017 18:07:55 -0000

Author: ngie
Date: Mon Jul 17 18:07:53 2017
New Revision: 321079
URL: https://svnweb.freebsd.org/changeset/base/321079

Log:
  Add tests that exercise -q, like -rq and add tests that test -q like -Nrq
  
  MFC after:	2 months
  MFC with:	r321076, r321077, r321078

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 18:06:42 2017	(r321078)
+++ head/usr.bin/diff/tests/diff_test.sh	Mon Jul 17 18:07:53 2017	(r321079)
@@ -118,13 +118,26 @@ brief_format_body()
 	atf_check -x "echo 2 > B/test-file"
 
 	atf_check cp -Rf A C
+	atf_check cp -Rf A D
 
+	atf_check -x "echo 3 > D/another-test-file"
+
 	atf_check \
 	    -s exit:1 \
 	    -o inline:"Files A/test-file and B/test-file differ\n" \
-	    diff -Nrq A B
+	    diff -rq A B
 
-	atf_check diff -Nrq A C
+	atf_check diff -rq A C
+
+	atf_check \
+	    -s exit:1 \
+	    -o inline:"Only in D: another-test-file\n" \
+	    diff -rq 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
 }
 
 atf_init_test_cases()