From owner-svn-src-all@freebsd.org Mon May 13 17:51:04 2019 Return-Path: Delivered-To: svn-src-all@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 69D861596921; Mon, 13 May 2019 17:51:04 +0000 (UTC) (envelope-from markj@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 1BDCF8CB77; Mon, 13 May 2019 17:51:04 +0000 (UTC) (envelope-from markj@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 EA376D42E; Mon, 13 May 2019 17:51:03 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4DHp3i6022586; Mon, 13 May 2019 17:51:03 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4DHp3oA022584; Mon, 13 May 2019 17:51:03 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201905131751.x4DHp3oA022584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 13 May 2019 17:51:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r347535 - head/lib/libcasper/services/cap_sysctl/tests X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/lib/libcasper/services/cap_sysctl/tests X-SVN-Commit-Revision: 347535 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1BDCF8CB77 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,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-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: Mon, 13 May 2019 17:51:04 -0000 Author: markj Date: Mon May 13 17:51:03 2019 New Revision: 347535 URL: https://svnweb.freebsd.org/changeset/base/347535 Log: Convert the libcap_sysctl test cases to ATF. Reviewed by: oshogbo Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17855 Modified: head/lib/libcasper/services/cap_sysctl/tests/Makefile head/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c Modified: head/lib/libcasper/services/cap_sysctl/tests/Makefile ============================================================================== --- head/lib/libcasper/services/cap_sysctl/tests/Makefile Mon May 13 17:49:54 2019 (r347534) +++ head/lib/libcasper/services/cap_sysctl/tests/Makefile Mon May 13 17:51:03 2019 (r347535) @@ -2,7 +2,7 @@ .include -TAP_TESTS_C= sysctl_test +ATF_TESTS_C= sysctl_test .if ${MK_CASPER} != "no" LIBADD+= casper Modified: head/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c ============================================================================== --- head/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c Mon May 13 17:49:54 2019 (r347534) +++ head/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c Mon May 13 17:51:03 2019 (r347535) @@ -50,39 +50,21 @@ __FBSDID("$FreeBSD$"); #include #include - #include +#include + /* * We need some sysctls to perform the tests on. * We remember their values and restore them afer the test is done. */ #define SYSCTL0_PARENT "kern" #define SYSCTL0_NAME "kern.sync_on_panic" +#define SYSCTL0_FILE "./sysctl0" #define SYSCTL1_PARENT "debug" #define SYSCTL1_NAME "debug.minidump" +#define SYSCTL1_FILE "./sysctl1" -static int ntest = 1; - -#define CHECK(expr) do { \ - if ((expr)) \ - printf("ok %d # %s:%u\n", ntest, __FILE__, __LINE__); \ - else \ - printf("not ok %d # %s:%u\n", ntest, __FILE__, __LINE__); \ - fflush(stdout); \ - ntest++; \ -} while (0) -#define CHECKX(expr) do { \ - if ((expr)) { \ - printf("ok %d # %s:%u\n", ntest, __FILE__, __LINE__); \ - } else { \ - printf("not ok %d # %s:%u\n", ntest, __FILE__, __LINE__); \ - exit(1); \ - } \ - fflush(stdout); \ - ntest++; \ -} while (0) - #define SYSCTL0_READ0 0x0001 #define SYSCTL0_READ1 0x0002 #define SYSCTL0_READ2 0x0004 @@ -94,8 +76,77 @@ static int ntest = 1; #define SYSCTL1_WRITE 0x0100 #define SYSCTL1_READ_WRITE 0x0200 +static void +save_int_sysctl(const char *name, const char *file) +{ + ssize_t n; + size_t sz; + int error, fd, val; + + sz = sizeof(val); + error = sysctlbyname(name, &val, &sz, NULL, 0); + ATF_REQUIRE_MSG(error == 0, + "sysctlbyname(%s): %s", name, strerror(errno)); + + fd = open(file, O_CREAT | O_WRONLY, 0600); + ATF_REQUIRE_MSG(fd >= 0, "open(%s): %s", file, strerror(errno)); + n = write(fd, &val, sz); + ATF_REQUIRE(n >= 0 && (size_t)n == sz); + error = close(fd); + ATF_REQUIRE(error == 0); +} + +static void +restore_int_sysctl(const char *name, const char *file) +{ + ssize_t n; + size_t sz; + int error, fd, val; + + fd = open(file, O_RDONLY); + ATF_REQUIRE(fd >= 0); + sz = sizeof(val); + n = read(fd, &val, sz); + ATF_REQUIRE(n >= 0 && (size_t)n == sz); + error = unlink(file); + ATF_REQUIRE(error == 0); + error = close(fd); + ATF_REQUIRE(error == 0); + + error = sysctlbyname(name, NULL, NULL, &val, sz); + ATF_REQUIRE_MSG(error == 0, + "sysctlbyname(%s): %s", name, strerror(errno)); +} + +static cap_channel_t * +initcap(void) +{ + cap_channel_t *capcas, *capsysctl; + + save_int_sysctl(SYSCTL0_NAME, SYSCTL0_FILE); + save_int_sysctl(SYSCTL1_NAME, SYSCTL1_FILE); + + capcas = cap_init(); + ATF_REQUIRE(capcas != NULL); + + capsysctl = cap_service_open(capcas, "system.sysctl"); + ATF_REQUIRE(capsysctl != NULL); + + cap_close(capcas); + + return (capsysctl); +} + +static void +cleanup(void) +{ + + restore_int_sysctl(SYSCTL0_NAME, SYSCTL0_FILE); + restore_int_sysctl(SYSCTL1_NAME, SYSCTL1_FILE); +} + static unsigned int -runtest(cap_channel_t *capsysctl) +checkcaps(cap_channel_t *capsysctl) { unsigned int result; int oldvalue, newvalue; @@ -184,27 +235,32 @@ runtest(cap_channel_t *capsysctl) return (result); } -static void -test_operation(cap_channel_t *origcapsysctl) +ATF_TC_WITH_CLEANUP(cap_sysctl__operation); +ATF_TC_HEAD(cap_sysctl__operation, tc) { - cap_channel_t *capsysctl; +} +ATF_TC_BODY(cap_sysctl__operation, tc) +{ + cap_channel_t *capsysctl, *ocapsysctl; void *limit; + ocapsysctl = initcap(); + /* * Allow: * SYSCTL0_PARENT/RDWR/RECURSIVE * SYSCTL1_PARENT/RDWR/RECURSIVE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, @@ -213,14 +269,14 @@ test_operation(cap_channel_t *origcapsysctl) CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, "foo.bar", CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, "foo.bar", CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 | + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 | SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE | SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE | SYSCTL1_READ_WRITE)); @@ -230,9 +286,9 @@ test_operation(cap_channel_t *origcapsysctl) CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); - CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 | + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 | SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE | SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE | SYSCTL1_READ_WRITE)); @@ -242,22 +298,22 @@ test_operation(cap_channel_t *origcapsysctl) CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); - CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_WRITE)); + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_WRITE)); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); - CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_WRITE)); + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_WRITE)); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); - CHECK(runtest(capsysctl) == SYSCTL0_READ0); + ATF_REQUIRE(checkcaps(capsysctl) == SYSCTL0_READ0); cap_close(capsysctl); @@ -267,35 +323,35 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_NAME/RDWR/RECURSIVE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 | + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 | SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE | SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE | SYSCTL1_READ_WRITE)); @@ -308,31 +364,31 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_PARENT/RDWR */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == 0); + ATF_REQUIRE(checkcaps(capsysctl) == 0); cap_close(capsysctl); @@ -342,31 +398,31 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_NAME/RDWR */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 | + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 | SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE | SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE | SYSCTL1_READ_WRITE)); @@ -379,34 +435,34 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_PARENT/RDWR/RECURSIVE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == (SYSCTL1_READ0 | SYSCTL1_READ1 | + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE | SYSCTL1_READ_WRITE)); cap_close(capsysctl); @@ -417,30 +473,30 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_NAME/RDWR/RECURSIVE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 | + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 | SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE | SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE | SYSCTL1_READ_WRITE)); @@ -453,51 +509,51 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_PARENT/READ/RECURSIVE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_WRITE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0)); + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0)); cap_close(capsysctl); @@ -507,51 +563,51 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_NAME/READ/RECURSIVE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_WRITE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0)); + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0)); cap_close(capsysctl); @@ -561,59 +617,59 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_PARENT/READ */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_WRITE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == 0); + ATF_REQUIRE(checkcaps(capsysctl) == 0); cap_close(capsysctl); @@ -623,59 +679,59 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_NAME/READ */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_WRITE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0)); + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0)); cap_close(capsysctl); @@ -685,21 +741,21 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_PARENT/READ/RECURSIVE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == SYSCTL1_READ0); + ATF_REQUIRE(checkcaps(capsysctl) == SYSCTL1_READ0); cap_close(capsysctl); @@ -709,21 +765,21 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_NAME/READ/RECURSIVE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0)); + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0)); cap_close(capsysctl); @@ -733,51 +789,51 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_PARENT/WRITE/RECURSIVE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == (SYSCTL0_WRITE | SYSCTL1_WRITE)); + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_WRITE | SYSCTL1_WRITE)); cap_close(capsysctl); @@ -787,51 +843,51 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_NAME/WRITE/RECURSIVE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == (SYSCTL0_WRITE | SYSCTL1_WRITE)); + ATF_REQUIRE(checkcaps(capsysctl) == (SYSCTL0_WRITE | SYSCTL1_WRITE)); cap_close(capsysctl); @@ -841,59 +897,59 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_PARENT/WRITE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_WRITE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL1_PARENT, CAP_SYSCTL_RDWR); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_PARENT, CAP_SYSCTL_READ); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capsysctl) == 0); + ATF_REQUIRE(checkcaps(capsysctl) == 0); cap_close(capsysctl); @@ -903,59 +959,59 @@ test_operation(cap_channel_t *origcapsysctl) * SYSCTL1_NAME/WRITE */ - capsysctl = cap_clone(origcapsysctl); - CHECK(capsysctl != NULL); + capsysctl = cap_clone(ocapsysctl); + ATF_REQUIRE(capsysctl != NULL); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_WRITE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_WRITE); - CHECK(cap_sysctl_limit(limit) == 0); + ATF_REQUIRE(cap_sysctl_limit(limit) == 0); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); (void)cap_sysctl_limit_name(limit, SYSCTL1_NAME, CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE); - CHECK(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); + ATF_REQUIRE(cap_sysctl_limit(limit) == -1 && errno == ENOTCAPABLE); limit = cap_sysctl_limit_init(capsysctl); (void)cap_sysctl_limit_name(limit, SYSCTL0_NAME, CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***