From owner-svn-src-head@freebsd.org  Wed Jan 27 16:13:12 2016
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 4784BA6FA44;
 Wed, 27 Jan 2016 16:13:12 +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 0FA13187B;
 Wed, 27 Jan 2016 16:13:11 +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 u0RGDAZD007868;
 Wed, 27 Jan 2016 16:13:10 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0RGDAXd007867;
 Wed, 27 Jan 2016 16:13:10 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201601271613.u0RGDAXd007867@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: Wed, 27 Jan 2016 16:13:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294923 - head/contrib/netbsd-tests/usr.bin/grep
X-SVN-Group: head
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.20
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: Wed, 27 Jan 2016 16:13:12 -0000

Author: asomers
Date: Wed Jan 27 16:13:10 2016
New Revision: 294923
URL: https://svnweb.freebsd.org/changeset/base/294923

Log:
  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.
  
  Reviewed by:	ngie
  MFC after:	32 days
  Sponsored by:	Spectra Logic Corp
  Differential Revision:	https://reviews.freebsd.org/D4925

Modified:
  head/contrib/netbsd-tests/usr.bin/grep/t_grep.sh

Modified: head/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
==============================================================================
--- head/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Wed Jan 27 15:28:23 2016	(r294922)
+++ head/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Wed Jan 27 16:13:10 2016	(r294923)
@@ -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