svn commit: r345218 - in projects/capsicum-test: etc/mtree tests/sys tests/sys/capsicum-test
Enji Cooper
ngie at FreeBSD.org
Sat Mar 16 03:58:25 UTC 2019
Author: ngie
Date: Sat Mar 16 03:58:23 2019
New Revision: 345218
URL: https://svnweb.freebsd.org/changeset/base/345218
Log:
Integrate capsicum-test into the build/FreeBSD test suite
TODO:
* test this on my -CURRENT system.
* test this with C++11 capable gcc versions.
Added:
projects/capsicum-test/tests/sys/capsicum-test/
projects/capsicum-test/tests/sys/capsicum-test/Makefile (contents, props changed)
Modified:
projects/capsicum-test/etc/mtree/BSD.tests.dist
projects/capsicum-test/tests/sys/Makefile
Modified: projects/capsicum-test/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/capsicum-test/etc/mtree/BSD.tests.dist Sat Mar 16 03:47:15 2019 (r345217)
+++ projects/capsicum-test/etc/mtree/BSD.tests.dist Sat Mar 16 03:58:23 2019 (r345218)
@@ -462,6 +462,8 @@
..
capsicum
..
+ capsicum-test
+ ..
cddl
zfs
bin
Modified: projects/capsicum-test/tests/sys/Makefile
==============================================================================
--- projects/capsicum-test/tests/sys/Makefile Sat Mar 16 03:47:15 2019 (r345217)
+++ projects/capsicum-test/tests/sys/Makefile Sat Mar 16 03:58:23 2019 (r345218)
@@ -9,6 +9,7 @@ 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
@@ -34,6 +35,10 @@ _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
Added: projects/capsicum-test/tests/sys/capsicum-test/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/capsicum-test/tests/sys/capsicum-test/Makefile Sat Mar 16 03:58:23 2019 (r345218)
@@ -0,0 +1,45 @@
+# $FreeBSD$
+
+.PATH: ${SRCTOP}/contrib/capsicum-test
+
+TESTSDIR= ${TESTSBASE}/sys/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
+
+SRCS.smoketest+= \
+ smoketest.c
+
+LIBADD.capsicum-test+= gtest pthread
+
+PROG_OVERRIDE_VARS+= NO_SHARED
+.for p in mini-me mini-me.noexec mini-me-setuid
+PROGS+= $p
+NO_SHARED.$p=
+SRCS.$p= mini-me.c
+.endfor
+
+BINMODE.mini-me.noexec= ${NOBINMODE}
+BINMODE.mini-me.setuid= 01444
+
+WARNS?= 3
+
+.include <bsd.test.mk>
More information about the svn-src-projects
mailing list