From owner-svn-src-stable-10@freebsd.org  Tue May 10 17:34:36 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 B2563B35EDC;
 Tue, 10 May 2016 17:34:36 +0000 (UTC)
 (envelope-from asomers@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 7EE6D13D5;
 Tue, 10 May 2016 17:34:36 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4AHYZHp007210;
 Tue, 10 May 2016 17:34:35 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4AHYZeJ007209;
 Tue, 10 May 2016 17:34:35 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201605101734.u4AHYZeJ007209@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 10 May 2016 17:34:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r299378 - stable/10/contrib/netbsd-tests/usr.bin/grep
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 May 2016 17:34:36 -0000

Author: asomers
Date: Tue May 10 17:34:35 2016
New Revision: 299378
URL: https://svnweb.freebsd.org/changeset/base/299378

Log:
  MFC 294923
  
  Fix grep_test:recurse with ZFS and TMPFS tmpdirs
  
  contrib/netbsd-tests/usr.bin/grep/t_grep.sh
  	Fix grep_test:recurse when /tmp is either zfs or tmpfs. The test was
  	relying on an implicit ordering of directory recursion which happens to
  	be true when using UFS. grep's specification requires no such ordering.
  	The solution is to ignore the order of grep's results.

Modified:
  stable/10/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
==============================================================================
--- stable/10/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Tue May 10 17:01:51 2016	(r299377)
+++ stable/10/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Tue May 10 17:34:35 2016	(r299378)
@@ -70,7 +70,15 @@ recurse_body()
 	echo -e "cod\ndover sole\nhaddock\nhalibut\npilchard" > recurse/d/fish
 	echo -e "cod\nhaddock\nplaice" > recurse/a/f/favourite-fish
 
+	# Begin FreeBSD
+	if true; then
+		atf_check -o file:"$(atf_get_srcdir)/d_recurse.out" -x "grep -r haddock recurse | sort"
+	else
+	# End FreeBSD
 	atf_check -o file:"$(atf_get_srcdir)/d_recurse.out" grep -r haddock recurse
+	# Begin FreeBSD
+	fi
+	# End FreeBSD
 }
 
 atf_test_case recurse_symlink