svn commit: r345719 - in projects/capsicum-test: etc/mtree tests/sys tests/sys/capsicum tests/sys/capsicum-test

[Enji Cooper]

Author: ngie
Date: Sat Mar 30 00:35:32 2019
New Revision: 345719
URL: https://svnweb.freebsd.org/changeset/base/345719

Log:
  Merge tests/sys/capsicum-test into tests/sys/capsicum
  
  One of the stopgap issues with compiling capsicum-test in tests/sys/capsicum
  was that WARNS.capsicum-test wasn't overriding WARNS, resulting in compilation
  failures when the two were mixed.
  
  Now that D19755 is being fixes, WARNS.capsicum-test is able to properly
  override WARNS, making it possible for the two to coexist.

Deleted:
  projects/capsicum-test/tests/sys/capsicum-test/
Modified:
  projects/capsicum-test/etc/mtree/BSD.tests.dist
  projects/capsicum-test/tests/sys/Makefile
  projects/capsicum-test/tests/sys/capsicum/Makefile

Modified: projects/capsicum-test/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/capsicum-test/etc/mtree/BSD.tests.dist	Sat Mar 30 00:06:53 2019	(r345718)
+++ projects/capsicum-test/etc/mtree/BSD.tests.dist	Sat Mar 30 00:35:32 2019	(r345719)
@@ -462,8 +462,6 @@
         ..
         capsicum
         ..
-        capsicum-test
-        ..
         cddl
             zfs
                 bin

Modified: projects/capsicum-test/tests/sys/Makefile
==============================================================================
--- projects/capsicum-test/tests/sys/Makefile	Sat Mar 30 00:06:53 2019	(r345718)
+++ projects/capsicum-test/tests/sys/Makefile	Sat Mar 30 00:35:32 2019	(r345719)
@@ -9,7 +9,6 @@ TESTS_SUBDIRS+=		aio
 TESTS_SUBDIRS+=		${_audit}
 TESTS_SUBDIRS+=		auditpipe
 TESTS_SUBDIRS+=		capsicum
-TESTS_SUBDIRS+=		${_capsicum_test}
 TESTS_SUBDIRS+=		${_cddl}
 TESTS_SUBDIRS+=		fifo
 TESTS_SUBDIRS+=		file
@@ -35,10 +34,6 @@ _audit=	audit
 
 .if ${MK_CDDL} != "no"
 _cddl=	cddl
-.endif
-
-.if ${MK_GOOGLETEST} != "no"
-_capsicum_test=	capsicum-test
 .endif
 
 # Items not integrated into kyua runs by default

Modified: projects/capsicum-test/tests/sys/capsicum/Makefile
==============================================================================
--- projects/capsicum-test/tests/sys/capsicum/Makefile	Sat Mar 30 00:06:53 2019	(r345718)
+++ projects/capsicum-test/tests/sys/capsicum/Makefile	Sat Mar 30 00:35:32 2019	(r345719)
@@ -1,11 +1,55 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 TESTSDIR=	${TESTSBASE}/sys/capsicum
 
 ATF_TESTS_C+=	bindat_connectat
 ATF_TESTS_C+=	ioctls_test
 
 CFLAGS+=	-I${SRCTOP}/tests
+
+.if ${MK_GOOGLETEST} != no
+
+.PATH: ${SRCTOP}/contrib/capsicum-test
+
+GTESTS+=	capsicum-test
+
+SRCS.capsicum-test+=	\
+	capsicum-test-main.cc \
+	capsicum-test.cc \
+	capability-fd.cc \
+	fexecve.cc \
+	procdesc.cc \
+	capmode.cc \
+	fcntl.cc \
+	ioctl.cc \
+	openat.cc \
+	sysctl.cc \
+	select.cc \
+	mqueue.cc \
+	socket.cc \
+	sctp.cc \
+	capability-fd-pair.cc \
+	overhead.cc \
+	rename.cc
+
+LIBADD.capsicum-test+=	gtest pthread
+
+.for p in mini-me mini-me.noexec mini-me.setuid
+PROGS+=		$p
+NO_SHARED.$p=
+SRCS.$p=	mini-me.c
+.endfor
+
+BINDIR=	${TESTSDIR}
+
+BINMODE.mini-me.noexec=	${NOBINMODE}
+BINMODE.mini-me.setuid=	4444
+
+WARNS.capsicum-test=	3
+
+.endif
 
 WARNS?=	6