svn commit: r292853 - stable/10/contrib/netbsd-tests/usr.bin/grep

[Garrett Cooper]

Author: ngie
Date: Tue Dec 29 01:07:00 2015
New Revision: 292853
URL: https://svnweb.freebsd.org/changeset/base/292853

Log:
  MFC r292581:
  
  Use stable output to a test file instead of depending on the OS name being
  grep'able in /bin/sh
  
  This fixes the situation where the OS has been rebranded to something other
  than `FreeBSD`
  
  Obtained from: Isilon OneFS (^/onefs/head at r511419)
  Reviewed by: cem, Daniel O'Connor <darius at dons.net.au>
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/contrib/netbsd-tests/usr.bin/grep/d_binary.out
  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/d_binary.out
==============================================================================
--- stable/10/contrib/netbsd-tests/usr.bin/grep/d_binary.out	Tue Dec 29 01:05:48 2015	(r292852)
+++ stable/10/contrib/netbsd-tests/usr.bin/grep/d_binary.out	Tue Dec 29 01:07:00 2015	(r292853)
@@ -1 +1 @@
-Binary file /bin/sh matches
+Binary file test.file matches

Modified: stable/10/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
==============================================================================
--- stable/10/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Tue Dec 29 01:05:48 2015	(r292852)
+++ stable/10/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Tue Dec 29 01:07:00 2015	(r292853)
@@ -43,7 +43,20 @@ 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