From owner-svn-src-projects@freebsd.org Sat Mar 16 03:58:25 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A2651540185 for ; Sat, 16 Mar 2019 03:58:25 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DEA686C8B3; Sat, 16 Mar 2019 03:58:24 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B42301C797; Sat, 16 Mar 2019 03:58:24 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2G3wOV1092990; Sat, 16 Mar 2019 03:58:24 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2G3wOZk092987; Sat, 16 Mar 2019 03:58:24 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201903160358.x2G3wOZk092987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Sat, 16 Mar 2019 03:58:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345218 - in projects/capsicum-test: etc/mtree tests/sys tests/sys/capsicum-test X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/capsicum-test: etc/mtree tests/sys tests/sys/capsicum-test X-SVN-Commit-Revision: 345218 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DEA686C8B3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.948,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2019 03:58:25 -0000 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