svn commit: r356768 - stable/12/tests/sys/capsicum

[Ed Maste]

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 <atf-c.h>
 
+#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);