From owner-svn-src-projects@freebsd.org  Mon Jan 16 17:49:55 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 8A989CB222B
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 16 Jan 2017 17:49:55 +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 34A1718D8;
 Mon, 16 Jan 2017 17:49:55 +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 v0GHnsHx071708;
 Mon, 16 Jan 2017 17:49:54 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0GHnsbI071706;
 Mon, 16 Jan 2017 17:49:54 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701161749.v0GHnsbI071706@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Mon, 16 Jan 2017 17:49:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r312297 - in projects/netbsd-tests-upstream-01-2017:
 contrib/netbsd-tests/fs/tmpfs tests/sys/fs/tmpfs
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jan 2017 17:49:55 -0000

Author: ngie
Date: Mon Jan 16 17:49:53 2017
New Revision: 312297
URL: https://svnweb.freebsd.org/changeset/base/312297

Log:
  Use _SED to rewrite mknod ... p command as mkfifo instead of
  adding an unnecessary diff to the test

Modified:
  projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh
  projects/netbsd-tests-upstream-01-2017/tests/sys/fs/tmpfs/Makefile

Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh	Mon Jan 16 17:46:38 2017	(r312296)
+++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh	Mon Jan 16 17:49:53 2017	(r312297)
@@ -59,15 +59,7 @@ types_body() {
 	atf_check -s eq:0 -o empty -e empty ln -s reg lnk
 	atf_check -s eq:0 -o empty -e empty mknod blk b 0 0
 	atf_check -s eq:0 -o empty -e empty mknod chr c 0 0
-	# Begin FreeBSD
-	if true; then
-	atf_check -s eq:0 -o empty -e empty mkfifo fifo
-	else
-	# End FreeBSD
 	atf_check -s eq:0 -o empty -e empty mknod fifo p
-	# Begin FreeBSD
-	fi
-	# End FreeBSD
 	atf_check -s eq:0 -o empty -e empty \
 	    $(atf_get_srcdir)/h_tools sockets sock
 

Modified: projects/netbsd-tests-upstream-01-2017/tests/sys/fs/tmpfs/Makefile
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/tests/sys/fs/tmpfs/Makefile	Mon Jan 16 17:46:38 2017	(r312296)
+++ projects/netbsd-tests-upstream-01-2017/tests/sys/fs/tmpfs/Makefile	Mon Jan 16 17:49:53 2017	(r312297)
@@ -47,6 +47,7 @@ ATF_TESTS_SH_SED_mount_test=		\
 					-e 's,-o -s,-o size=,g' \
 					-e 's,-o -u,-o uid=,g' \
 					-e 's,mount_${FILESYSTEM},mount -t ${FILESYSTEM},g'
+ATF_TESTS_SH_SED_readdir_test=		-e 's,mknod fifo p,mkfifo fifo,g'
 ATF_TESTS_SH_SED_sizes_test=		-e 's,-o -s,-o size=,g'
 ATF_TESTS_SH_SED_statvfs_test=		-e 's,-o -s,-o size=,g'
 ATF_TESTS_SH_SED_vnode_leak_test=	-e 's,-o -s,-o size=,g'