12 files changed, 44 insertions, 7 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 0f4f264..ad76402 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -386,6 +386,12 @@
         ..
         kqueue
         ..
+        mac
+            bsdextended
+            ..
+            portacl
+            ..
+        ..
         mqueue
         ..
         netinet
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 015040d..4e653be 100644
--- a/tests/sys/Makefile
+++ b/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
diff --git a/tests/sys/mac/Makefile b/tests/sys/mac/Makefile
new file mode 100644
index 0000000..ae2c491
--- /dev/null
+++ b/tests/sys/mac/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/mac
+
+TESTS_SUBDIRS+=	bsdextended
+TESTS_SUBDIRS+=	portacl
+
+.include <bsd.test.mk>
diff --git a/tests/sys/mac/bsdextended/Makefile b/tests/sys/mac/bsdextended/Makefile
new file mode 100644
index 0000000..9d0b6f6
--- /dev/null
+++ b/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>
diff --git a/tools/regression/mac/mac_bsdextended/test_matches.sh b/tests/sys/mac/bsdextended/matches_test.sh
index 5aff413..5aff413 100644
--- a/tools/regression/mac/mac_bsdextended/test_matches.sh
+++ b/tests/sys/mac/bsdextended/matches_test.sh
diff --git a/tools/regression/mac/mac_bsdextended/test_ugidfw.c b/tests/sys/mac/bsdextended/ugidfw_test.c
index 7c1dc2a..7c1dc2a 100644
--- a/tools/regression/mac/mac_bsdextended/test_ugidfw.c
+++ b/tests/sys/mac/bsdextended/ugidfw_test.c
diff --git a/tools/regression/mac/mac_portacl/LICENSE b/tests/sys/mac/portacl/LICENSE
index c95c149..c95c149 100644
--- a/tools/regression/mac/mac_portacl/LICENSE
+++ b/tests/sys/mac/portacl/LICENSE
diff --git a/tests/sys/mac/portacl/Makefile b/tests/sys/mac/portacl/Makefile
new file mode 100644
index 0000000..129d486
--- /dev/null
+++ b/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>
diff --git a/tools/regression/mac/mac_portacl/misc.sh b/tests/sys/mac/portacl/misc.sh
index 5a9e67b..5a9e67b 100755
--- a/tools/regression/mac/mac_portacl/misc.sh
+++ b/tests/sys/mac/portacl/misc.sh
diff --git a/tools/regression/mac/mac_portacl/nobody.t b/tests/sys/mac/portacl/nobody_test.sh
index 7d8dbd6..7d8dbd6 100755
--- a/tools/regression/mac/mac_portacl/nobody.t
+++ b/tests/sys/mac/portacl/nobody_test.sh
diff --git a/tools/regression/mac/mac_portacl/root.t b/tests/sys/mac/portacl/root_test.sh
index 9ed452f..9ed452f 100755
--- a/tools/regression/mac/mac_portacl/root.t
+++ b/tests/sys/mac/portacl/root_test.sh
diff --git a/tools/regression/mac/mac_bsdextended/Makefile b/tools/regression/mac/mac_bsdextended/Makefile
deleted file mode 100644
index aaa060a..0000000
--- a/tools/regression/mac/mac_bsdextended/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	test_ugidfw
-LIBADD=	ugidfw
-MAN=
-
-.include <bsd.prog.mk>