svn commit: r289446 - in head: etc/mtree tests/sys tests/sys/acl tools/regression/acltools

[Garrett Cooper]

Author: ngie
Date: Sat Oct 17 08:39:37 2015
New Revision: 289446
URL: https://svnweb.freebsd.org/changeset/base/289446

Log:
  Integrate tools/regression/acltools into the FreeBSD test suite as tests/sys/acl
  
  - Make the requirements more complete for the testcases
  - Detect prerequisites so the tests won't fail (zfs.ko is loaded, zpool(1)
    is available, ACL support is enabled with UFS, etc).
  - Work with temporary files/directories/mountpoints that work with atf/kyua
  - Limit the testcases to work on temporary filesystems to reduce tainting the
    test host
  
  MFC after: 2 weeks
  Reviewed by: trasz (earlier version)
  Differential Revision: https://reviews.freebsd.org/D3810

Added:
  head/tests/sys/acl/
     - copied from r289236, user/ngie/more-tests2/tests/sys/acl/
  head/tests/sys/acl/Makefile
     - copied unchanged from r289325, user/ngie/more-tests2/tests/sys/acl/Makefile
Deleted:
  head/tools/regression/acltools/
Modified:
  head/etc/mtree/BSD.tests.dist
  head/tests/sys/Makefile
Directory Properties:
  head/   (props changed)

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Sat Oct 17 07:32:46 2015	(r289445)
+++ head/etc/mtree/BSD.tests.dist	Sat Oct 17 08:39:37 2015	(r289446)
@@ -360,6 +360,8 @@
         ..
     ..
     sys
+        acl
+        ..
         aio
         ..
         fifo

Modified: head/tests/sys/Makefile
==============================================================================
--- head/tests/sys/Makefile	Sat Oct 17 07:32:46 2015	(r289445)
+++ head/tests/sys/Makefile	Sat Oct 17 08:39:37 2015	(r289446)
@@ -4,6 +4,7 @@
 
 TESTSDIR= ${TESTSBASE}/sys
 
+TESTS_SUBDIRS+=		acl
 TESTS_SUBDIRS+=		aio
 TESTS_SUBDIRS+=		fifo
 TESTS_SUBDIRS+=		file

Copied: head/tests/sys/acl/Makefile (from r289325, user/ngie/more-tests2/tests/sys/acl/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tests/sys/acl/Makefile	Sat Oct 17 08:39:37 2015	(r289446, copy of r289325, user/ngie/more-tests2/tests/sys/acl/Makefile)
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/acl
+
+BINDIR=		${TESTSDIR}
+
+FILES+=		tools-crossfs.test
+FILES+=		tools-nfs4.test
+FILES+=		tools-nfs4-psarc.test
+FILES+=		tools-nfs4-trivial.test
+FILES+=		tools-posix.test
+
+SCRIPTS+=	run
+
+TAP_TESTS_SH+=	00
+TAP_TESTS_SH+=	01
+TAP_TESTS_SH+=	02
+TAP_TESTS_SH+=	03
+TAP_TESTS_SH+=	04
+
+.for t in ${TAP_TESTS_SH}
+TEST_METADATA.$t+=	required_user="root"
+.endfor
+
+.for t in 01 03 04
+TEST_METADATA.$t+=	required_programs="/sbin/zpool"
+.endfor
+
+.include <bsd.test.mk>