diff options
Diffstat (limited to 'contrib/netbsd-tests/usr.bin/grep/t_grep.sh')
-rwxr-xr-x | contrib/netbsd-tests/usr.bin/grep/t_grep.sh | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/contrib/netbsd-tests/usr.bin/grep/t_grep.sh b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh index 95f0778..558b074 100755 --- a/contrib/netbsd-tests/usr.bin/grep/t_grep.sh +++ b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_grep.sh,v 1.2 2013/05/17 15:39:17 christos Exp $ +# $NetBSD: t_grep.sh,v 1.3 2017/01/14 20:43:52 christos Exp $ # # Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. # All rights reserved. @@ -43,20 +43,9 @@ binary_head() } binary_body() { - # Begin FreeBSD - # - # Generate stable output instead of depending on uname to match the - # branded OS name of /bin/sh - if true; then dd if=/dev/zero count=1 of=test.file echo -n "foobar" >> test.file atf_check -o file:"$(atf_get_srcdir)/d_binary.out" grep foobar test.file - else - # End FreeBSD - atf_check -o file:"$(atf_get_srcdir)/d_binary.out" grep $(uname) /bin/sh - # Begin FreeBSD - fi - # End FreeBSD } atf_test_case recurse @@ -70,15 +59,7 @@ 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_check -o file:"$(atf_get_srcdir)/d_recurse.out" -x "grep -r haddock recurse | sort" } atf_test_case recurse_symlink |