From owner-svn-src-all@freebsd.org Wed Jan 15 21:05:43 2020 Return-Path: Delivered-To: svn-src-all@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 DF8071FD70D; Wed, 15 Jan 2020 21:05:43 +0000 (UTC) (envelope-from emaste@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 47yfxM5c5Tz41b2; Wed, 15 Jan 2020 21:05:43 +0000 (UTC) (envelope-from emaste@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 BBB5CCAD9; Wed, 15 Jan 2020 21:05:43 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00FL5hBR056445; Wed, 15 Jan 2020 21:05:43 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00FL5h3f056444; Wed, 15 Jan 2020 21:05:43 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202001152105.00FL5h3f056444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 15 Jan 2020 21:05:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r356768 - stable/12/tests/sys/capsicum X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/tests/sys/capsicum X-SVN-Commit-Revision: 356768 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2020 21:05:43 -0000 Author: emaste Date: Wed Jan 15 21:05:43 2020 New Revision: 356768 URL: https://svnweb.freebsd.org/changeset/base/356768 Log: MFC r345681: Skip test if feature security_capabilities is not available PR: 236863 Sponsored by: The FreeBSD Foundation Modified: stable/12/tests/sys/capsicum/Makefile stable/12/tests/sys/capsicum/ioctls_test.c Directory Properties: stable/12/ (props changed) Modified: stable/12/tests/sys/capsicum/Makefile ============================================================================== --- stable/12/tests/sys/capsicum/Makefile Wed Jan 15 20:25:52 2020 (r356767) +++ stable/12/tests/sys/capsicum/Makefile Wed Jan 15 21:05:43 2020 (r356768) @@ -5,7 +5,7 @@ TESTSDIR= ${TESTSBASE}/sys/capsicum ATF_TESTS_C+= bindat_connectat ATF_TESTS_C+= ioctls_test -CFLAGS.bindat_connectat.c+= -I${SRCTOP}/tests +CFLAGS+= -I${SRCTOP}/tests WARNS?= 6 Modified: stable/12/tests/sys/capsicum/ioctls_test.c ============================================================================== --- stable/12/tests/sys/capsicum/ioctls_test.c Wed Jan 15 20:25:52 2020 (r356767) +++ stable/12/tests/sys/capsicum/ioctls_test.c Wed Jan 15 21:05:43 2020 (r356768) @@ -38,6 +38,8 @@ __FBSDID("$FreeBSD$"); #include +#include "freebsd_test_suite/macros.h" + /* * A variant of ATF_REQUIRE that is suitable for use in child * processes. This only works if the parent process is tripped up by @@ -73,6 +75,8 @@ ATF_TC_BODY(cap_ioctls__listen_copy, tc) pid_t pid; char dummy; int s[2], status; + + ATF_REQUIRE_FEATURE("security_capabilities"); s[0] = socket(AF_INET, SOCK_STREAM, 0); ATF_REQUIRE(s[0] > 0);