From owner-svn-src-head@freebsd.org  Tue Dec 22 01:21:28 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D82EBA4E20C;
 Tue, 22 Dec 2015 01:21:28 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A57281738;
 Tue, 22 Dec 2015 01:21:28 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBM1LR3g081060;
 Tue, 22 Dec 2015 01:21:27 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBM1LRuZ081058;
 Tue, 22 Dec 2015 01:21:27 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512220121.tBM1LRuZ081058@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Tue, 22 Dec 2015 01:21:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292581 - head/contrib/netbsd-tests/usr.bin/grep
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Dec 2015 01:21:28 -0000

Author: ngie
Date: Tue Dec 22 01:21:27 2015
New Revision: 292581
URL: https://svnweb.freebsd.org/changeset/base/292581

Log:
  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`
  
  MFC after: 1 week
  Obtained from: Isilon OneFS (^/onefs/head@r511419)
  Reviewed by: cem, Daniel O'Connor <darius@dons.net.au>
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/usr.bin/grep/d_binary.out
  head/contrib/netbsd-tests/usr.bin/grep/t_grep.sh

Modified: head/contrib/netbsd-tests/usr.bin/grep/d_binary.out
==============================================================================
--- head/contrib/netbsd-tests/usr.bin/grep/d_binary.out	Tue Dec 22 00:58:35 2015	(r292580)
+++ head/contrib/netbsd-tests/usr.bin/grep/d_binary.out	Tue Dec 22 01:21:27 2015	(r292581)
@@ -1 +1 @@
-Binary file /bin/sh matches
+Binary file test.file matches

Modified: head/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
==============================================================================
--- head/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Tue Dec 22 00:58:35 2015	(r292580)
+++ head/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Tue Dec 22 01:21:27 2015	(r292581)
@@ -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