svn commit: r313519 - in stable/10: etc/mtree tests/sys tests/sys/fs tests/sys/fs/tmpfs

[Ngie Cooper]

Author: ngie
Date: Fri Feb 10 03:17:11 2017
New Revision: 313519
URL: https://svnweb.freebsd.org/changeset/base/313519

Log:
  MFC r307702:
  
  Integrate contrib/netbsd-tests/fs/tmpfs into the FreeBSD test suite
  as tests/sys/fs
  
  These testcases exercise tmpfs support

Added:
  stable/10/tests/sys/fs/
     - copied from r307702, head/tests/sys/fs/
Modified:
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/tests/sys/Makefile
  stable/10/tests/sys/fs/Makefile
  stable/10/tests/sys/fs/tmpfs/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Fri Feb 10 03:04:42 2017	(r313518)
+++ stable/10/etc/mtree/BSD.tests.dist	Fri Feb 10 03:17:11 2017	(r313519)
@@ -372,6 +372,10 @@
         ..
         file
         ..
+        fs
+            tmpfs
+            ..
+        ..
         geom
             class
                 concat

Modified: stable/10/tests/sys/Makefile
==============================================================================
--- stable/10/tests/sys/Makefile	Fri Feb 10 03:04:42 2017	(r313518)
+++ stable/10/tests/sys/Makefile	Fri Feb 10 03:17:11 2017	(r313519)
@@ -8,6 +8,7 @@ TESTS_SUBDIRS+=		acl
 TESTS_SUBDIRS+=		aio
 TESTS_SUBDIRS+=		fifo
 TESTS_SUBDIRS+=		file
+TESTS_SUBDIRS+=		fs
 TESTS_SUBDIRS+=		geom
 TESTS_SUBDIRS+=		kern
 TESTS_SUBDIRS+=		kqueue

Modified: stable/10/tests/sys/fs/Makefile
==============================================================================
--- head/tests/sys/fs/Makefile	Fri Oct 21 05:24:08 2016	(r307702)
+++ stable/10/tests/sys/fs/Makefile	Fri Feb 10 03:17:11 2017	(r313519)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=		tests
-
 TESTSDIR=		${TESTSBASE}/sys/fs
 
 TESTSRC=		${SRCTOP}/contrib/netbsd-tests/fs
@@ -9,8 +7,8 @@ TESTSRC=		${SRCTOP}/contrib/netbsd-tests
 #TESTS_SUBDIRS+=	nullfs	# XXX: needs rump
 TESTS_SUBDIRS+=		tmpfs
 
-${PACKAGE}FILES+=	h_funcs.subr
-${PACKAGE}FILESDIR=	${TESTSDIR}
+FILES+=			h_funcs.subr
+FILESDIR=		${TESTSDIR}
 
 CLEANFILES+=		h_funcs.subr
 CLEANFILES+=		h_funcs.subr.tmp

Modified: stable/10/tests/sys/fs/tmpfs/Makefile
==============================================================================
--- head/tests/sys/fs/tmpfs/Makefile	Fri Oct 21 05:24:08 2016	(r307702)
+++ stable/10/tests/sys/fs/tmpfs/Makefile	Fri Feb 10 03:17:11 2017	(r313519)
@@ -35,8 +35,8 @@ NETBSD_ATF_TESTS_SH+=	truncate_test
 NETBSD_ATF_TESTS_SH+=	vnd_test
 NETBSD_ATF_TESTS_SH+=	vnode_leak_test
 
-${PACKAGE}FILES+=	h_funcs.subr
-${PACKAGE}FILESDIR=	${TESTSDIR}
+FILES+=			h_funcs.subr
+FILESDIR=		${TESTSDIR}
 
 PROGS+=			h_tools
 BINDIR.h_tools=		${TESTSDIR}