svn commit: r294923 - head/contrib/netbsd-tests/usr.bin/grep

[Alan Somers]

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