Merge remote-tracking branch 'origin/stable/10' into develdevel

2 files changed, 77 insertions, 0 deletions

diff --git a/tests/sys/fs/Makefile b/tests/sys/fs/Makefile
new file mode 100644
index 0000000..9ed47c0
--- /dev/null
+++ b/tests/sys/fs/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+TESTSDIR=		${TESTSBASE}/sys/fs
+
+TESTSRC=		${SRCTOP}/contrib/netbsd-tests/fs
+
+#TESTS_SUBDIRS+=	nullfs	# XXX: needs rump
+TESTS_SUBDIRS+=		tmpfs
+
+FILES+=			h_funcs.subr
+FILESDIR=		${TESTSDIR}
+
+CLEANFILES+=		h_funcs.subr
+CLEANFILES+=		h_funcs.subr.tmp
+
+h_funcs.subr: ${TESTSRC}/h_funcs.subr
+	cat ${.ALLSRC} | \
+	    sed -e '/atf_require_prog mount_$${name}/d' >>${.TARGET}.tmp
+	mv ${.TARGET}.tmp ${.TARGET}
+
+.include <bsd.test.mk>
diff --git a/tests/sys/fs/tmpfs/Makefile b/tests/sys/fs/tmpfs/Makefile
new file mode 100644
index 0000000..78702dd
--- /dev/null
+++ b/tests/sys/fs/tmpfs/Makefile
@@ -0,0 +1,56 @@
+# $FreeBSD$
+
+PACKAGE=		tests
+
+FILESYSTEM?=		${.CURDIR:T}
+
+TESTSDIR=		${TESTSBASE}/sys/fs/${FILESYSTEM}
+
+TESTSRC=		${SRCTOP}/contrib/netbsd-tests/fs/${FILESYSTEM}
+
+# XXX: uses /dev/MAKEDEV to create pseudo /dev/{null,zero} character devices
+#NETBSD_ATF_TESTS_SH+=	devices_test
+NETBSD_ATF_TESTS_SH+=	create_test
+NETBSD_ATF_TESTS_SH+=	read_write_test
+NETBSD_ATF_TESTS_SH+=	dots_test
+NETBSD_ATF_TESTS_SH+=	exec_test
+NETBSD_ATF_TESTS_SH+=	link_test
+NETBSD_ATF_TESTS_SH+=	mkdir_test
+NETBSD_ATF_TESTS_SH+=	mknod_test
+NETBSD_ATF_TESTS_SH+=	mount_test
+# XXX: need to replace `mknod ... p` with something more sensible
+#NETBSD_ATF_TESTS_SH+=	pipes_test
+NETBSD_ATF_TESTS_SH+=	trail_slash_test
+NETBSD_ATF_TESTS_SH+=	readdir_test
+NETBSD_ATF_TESTS_SH+=	remove_test
+NETBSD_ATF_TESTS_SH+=	rename_test
+NETBSD_ATF_TESTS_SH+=	rmdir_test
+NETBSD_ATF_TESTS_SH+=	setattr_test
+NETBSD_ATF_TESTS_SH+=	sizes_test
+NETBSD_ATF_TESTS_SH+=	sockets_test
+NETBSD_ATF_TESTS_SH+=	statvfs_test
+NETBSD_ATF_TESTS_SH+=	symlink_test
+NETBSD_ATF_TESTS_SH+=	times_test
+NETBSD_ATF_TESTS_SH+=	truncate_test
+NETBSD_ATF_TESTS_SH+=	vnd_test
+NETBSD_ATF_TESTS_SH+=	vnode_leak_test
+
+FILES+=			h_funcs.subr
+FILESDIR=		${TESTSDIR}
+
+PROGS+=			h_tools
+BINDIR.h_tools=		${TESTSDIR}
+
+ATF_TESTS_SH_SED_mount_test=		\
+					-e 's,-o -g,-o gid=,g' \
+					-e 's,-o -m,-o mode=,g' \
+					-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_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'
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>