svn commit: r312297 - in projects/netbsd-tests-upstream-01-2017: contrib/netbsd-tests/fs/tmpfs tests/sys/fs/tmpfs

[Ngie Cooper]

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'