From 7bac4be87ac6260b1b8d7ac5ed2c6e12be324acc Mon Sep 17 00:00:00 2001
From: ngie <ngie@FreeBSD.org>
Date: Mon, 21 Dec 2015 21:24:03 +0000
Subject: [PATCH] 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                         |  6 ++++++
 tests/sys/Makefile                               |  1 +
 tests/sys/mac/Makefile                           |  8 ++++++++
 tests/sys/mac/bsdextended/Makefile               | 13 +++++++++++++
 .../sys/mac/bsdextended/matches_test.sh          |  0
 .../sys/mac/bsdextended/ugidfw_test.c            |  0
 .../sys/mac/portacl}/LICENSE                     |  0
 tests/sys/mac/portacl/Makefile                   | 16 ++++++++++++++++
 .../sys/mac/portacl}/misc.sh                     |  0
 .../sys/mac/portacl/nobody_test.sh               |  0
 .../root.t => tests/sys/mac/portacl/root_test.sh |  0
 tools/regression/mac/mac_bsdextended/Makefile    |  7 -------
 12 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 tests/sys/mac/Makefile
 create mode 100644 tests/sys/mac/bsdextended/Makefile
 rename tools/regression/mac/mac_bsdextended/test_matches.sh => tests/sys/mac/bsdextended/matches_test.sh (100%)
 rename tools/regression/mac/mac_bsdextended/test_ugidfw.c => tests/sys/mac/bsdextended/ugidfw_test.c (100%)
 rename {tools/regression/mac/mac_portacl => tests/sys/mac/portacl}/LICENSE (100%)
 create mode 100644 tests/sys/mac/portacl/Makefile
 rename {tools/regression/mac/mac_portacl => tests/sys/mac/portacl}/misc.sh (100%)
 rename tools/regression/mac/mac_portacl/nobody.t => tests/sys/mac/portacl/nobody_test.sh (100%)
 rename tools/regression/mac/mac_portacl/root.t => tests/sys/mac/portacl/root_test.sh (100%)
 delete mode 100644 tools/regression/mac/mac_bsdextended/Makefile

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 0f4f264aad99..ad764021857c 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 015040ddfd63..4e653be6530a 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 000000000000..ae2c4917b0d1
--- /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 000000000000..9d0b6f6907ca
--- /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
similarity index 100%
rename from tools/regression/mac/mac_bsdextended/test_matches.sh
rename to 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
similarity index 100%
rename from tools/regression/mac/mac_bsdextended/test_ugidfw.c
rename to tests/sys/mac/bsdextended/ugidfw_test.c
diff --git a/tools/regression/mac/mac_portacl/LICENSE b/tests/sys/mac/portacl/LICENSE
similarity index 100%
rename from tools/regression/mac/mac_portacl/LICENSE
rename to tests/sys/mac/portacl/LICENSE
diff --git a/tests/sys/mac/portacl/Makefile b/tests/sys/mac/portacl/Makefile
new file mode 100644
index 000000000000..129d4867cc99
--- /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
similarity index 100%
rename from tools/regression/mac/mac_portacl/misc.sh
rename to tests/sys/mac/portacl/misc.sh
diff --git a/tools/regression/mac/mac_portacl/nobody.t b/tests/sys/mac/portacl/nobody_test.sh
similarity index 100%
rename from tools/regression/mac/mac_portacl/nobody.t
rename to 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
similarity index 100%
rename from tools/regression/mac/mac_portacl/root.t
rename to 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 aaa060aefa79..000000000000
--- a/tools/regression/mac/mac_bsdextended/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	test_ugidfw
-LIBADD=	ugidfw
-MAN=
-
-.include <bsd.prog.mk>