From owner-svn-src-projects@freebsd.org Tue Sep 3 14:05:59 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 42A1CDC124 for ; Tue, 3 Sep 2019 14:05:59 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7yt1x2gz4P2n; Tue, 3 Sep 2019 14:05:58 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 69AE519EAC; Tue, 3 Sep 2019 14:05:52 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 7E42B1881A; Sat, 30 Mar 2019 00:35:37 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3455B89CE3; Sat, 30 Mar 2019 00:35:37 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 21EB018819; Sat, 30 Mar 2019 00:35:37 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 1E13118817 for ; Sat, 30 Mar 2019 00:35:34 +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 B0B5389CE1; Sat, 30 Mar 2019 00:35:33 +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 850756BF7; Sat, 30 Mar 2019 00:35:33 +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 x2U0ZXNF077573; Sat, 30 Mar 2019 00:35:33 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2U0ZXQe077571; Sat, 30 Mar 2019 00:35:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201903300035.x2U0ZXQe077571@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345719 - in projects/capsicum-test: etc/mtree tests/sys tests/sys/capsicum 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 tests/sys/capsicum-test X-SVN-Commit-Revision: 345719 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 3455B89CE3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.94)[-0.938,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US] Status: O X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:00 -0000 X-Original-Date: Sat, 30 Mar 2019 00:35:33 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:00 -0000 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 + 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