Author: olivier (ports committer)
Date: Fri Mar 29 08:43:21 2019
New Revision: 345681
URL: https://svnweb.freebsd.org/changeset/base/345681

Log:
  Skip test if feature security_capabilities is not available
  
  PR:           236863
  Approved by:  asomers
  MFC after:    1 month
  Sponsored by: Netflix

Modified:
  head/tests/sys/capsicum/Makefile
  head/tests/sys/capsicum/ioctls_test.c

Modified: head/tests/sys/capsicum/Makefile
==============================================================================
--- head/tests/sys/capsicum/Makefile    Fri Mar 29 04:00:46 2019        
(r345680)
+++ head/tests/sys/capsicum/Makefile    Fri Mar 29 08:43:21 2019        
(r345681)
@@ -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: head/tests/sys/capsicum/ioctls_test.c
==============================================================================
--- head/tests/sys/capsicum/ioctls_test.c       Fri Mar 29 04:00:46 2019        
(r345680)
+++ head/tests/sys/capsicum/ioctls_test.c       Fri Mar 29 08:43:21 2019        
(r345681)
@@ -37,6 +37,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
@@ -72,6 +74,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);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to