diff options
| author | asomers <asomers@FreeBSD.org> | 2016-01-27 16:13:10 +0000 |
|---|---|---|
| committer | asomers <asomers@FreeBSD.org> | 2016-01-27 16:13:10 +0000 |
| commit | 57291730689d515a8e74c0f0f020c4271a385eb5 (patch) | |
| tree | 090b066087196d4635457cbb8358b5d1cd04bb5d /contrib/netbsd-tests | |
| parent | d2ce3b96899b55779d81ed942b224085cfc6f678 (diff) | |
| download | FreeBSD-src-57291730689d515a8e74c0f0f020c4271a385eb5.zip FreeBSD-src-57291730689d515a8e74c0f0f020c4271a385eb5.tar.gz | |
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
Diffstat (limited to 'contrib/netbsd-tests')
| -rwxr-xr-x | contrib/netbsd-tests/usr.bin/grep/t_grep.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/contrib/netbsd-tests/usr.bin/grep/t_grep.sh b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh index 7e53016..95f0778 100755 --- a/contrib/netbsd-tests/usr.bin/grep/t_grep.sh +++ b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh @@ -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 |
