Integrate tools/regression/mac/mac_bsdextended and

tools/regression/mac/mac_portacl into the FreeBSD test suite as
tests/sys/mac/bsdextended and tests/sys/mac/portacl, respectively

MFC after: 1 month
Sponsored by: EMC / Isilon Storage Division

etc/mtree/BSD.tests.dist

@@ -386,6 +386,12 @@
         ..
         kqueue
         ..
+        mac
+            bsdextended
+            ..
+            portacl
+            ..
+        ..
         mqueue
         ..
         netinet

tests/sys/Makefile

@@ -10,6 +10,7 @@ TESTS_SUBDIRS+=		fifo
 TESTS_SUBDIRS+=		file
 TESTS_SUBDIRS+=		kern
 TESTS_SUBDIRS+=		kqueue
+TESTS_SUBDIRS+=		mac
 TESTS_SUBDIRS+=		mqueue
 TESTS_SUBDIRS+=		netinet
 TESTS_SUBDIRS+=		opencrypto

tests/sys/mac/Makefile

@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/mac
+
+TESTS_SUBDIRS+=	bsdextended
+TESTS_SUBDIRS+=	portacl
+
+.include <bsd.test.mk>

tests/sys/mac/bsdextended/Makefile

@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/mac/bsdextended
+
+TAP_TESTS_C+=	ugidfw_test
+TAP_TESTS_SH+=	matches_test
+
+LIBADD.ugidfw_test+=	ugidfw
+
+TEST_METADATA.matches_test+=	required_user="root"
+TEST_METADATA.ugidfw_test+=	required_user="root"
+
+.include <bsd.test.mk>

tests/sys/mac/portacl/Makefile

@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/mac/portacl
+BINDIR=		${TESTSDIR}
+
+FILES+=		misc.sh
+
+TAP_TESTS_SH+=	nobody_test
+TAP_TESTS_SH+=	root_test
+
+.for t in ${TAP_TESTS_SH}
+TEST_METADATA.$t+=	required_user="root"
+TEST_METADATA.$t+=	timeout="450"
+.endfor
+
+.include <bsd.test.mk>

tools/regression/mac/mac_bsdextended/Makefile

@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	test_ugidfw
-LIBADD=	ugidfw
-MAN=
-
-.include <bsd.prog.mk>