svn commit: r293251 - in stable/10: etc/mtree tests/sys tests/sys/mac tests/sys/mac/bsdextended

[Garrett Cooper]

Author: ngie
Date: Wed Jan  6 20:02:49 2016
New Revision: 293251
URL: https://svnweb.freebsd.org/changeset/base/293251

Log:
  MFC r292570:
  
  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

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

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Wed Jan  6 20:02:26 2016	(r293250)
+++ stable/10/etc/mtree/BSD.tests.dist	Wed Jan  6 20:02:49 2016	(r293251)
@@ -214,6 +214,12 @@
         ..
         kqueue
         ..
+        mac
+            bsdextended
+            ..
+            portacl
+            ..
+        ..
         mqueue
         ..
         netinet

Modified: stable/10/tests/sys/Makefile
==============================================================================
--- stable/10/tests/sys/Makefile	Wed Jan  6 20:02:26 2016	(r293250)
+++ stable/10/tests/sys/Makefile	Wed Jan  6 20:02:49 2016	(r293251)
@@ -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+=		posixshm

Modified: stable/10/tests/sys/mac/bsdextended/Makefile
==============================================================================
--- head/tests/sys/mac/bsdextended/Makefile	Mon Dec 21 21:24:03 2015	(r292570)
+++ stable/10/tests/sys/mac/bsdextended/Makefile	Wed Jan  6 20:02:49 2016	(r293251)
@@ -5,7 +5,8 @@ TESTSDIR=	${TESTSBASE}/sys/mac/bsdextend
 TAP_TESTS_C+=	ugidfw_test
 TAP_TESTS_SH+=	matches_test
 
-LIBADD.ugidfw_test+=	ugidfw
+DPADD.ugidfw_test+=	${LIBUGIDFW}
+LDADD.ugidfw_test+=	-lugidfw
 
 TEST_METADATA.matches_test+=	required_user="root"
 TEST_METADATA.ugidfw_test+=	required_user="root"