diff options
| author | asomers <asomers@FreeBSD.org> | 2016-05-10 17:34:35 +0000 |
|---|---|---|
| committer | asomers <asomers@FreeBSD.org> | 2016-05-10 17:34:35 +0000 |
| commit | 9ac8612d0f3c79f71f9edcb696ce11565506939c (patch) | |
| tree | 2dd437eb2f0bd40b5e99a62538c2c9c54c9e9d77 | |
| parent | 2dcc4d752ae214de606b7ef37b75e4cca6dff15f (diff) | |
| download | FreeBSD-src-9ac8612d0f3c79f71f9edcb696ce11565506939c.zip FreeBSD-src-9ac8612d0f3c79f71f9edcb696ce11565506939c.tar.gz | |
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.
| -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 |
