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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
