The branch main has been updated by arichardson:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1eec5861d52e074bc20d08aef051af59cc70040e
commit 1eec5861d52e074bc20d08aef051af59cc70040e
Author: Alex Richardson <arichard...@freebsd.org>
AuthorDate: 2021-02-04 17:48:29 +0000
Commit: Alex Richardson <arichard...@freebsd.org>
CommitDate: 2021-02-04 17:57:27 +0000
tests/sys/vfs/lookup_cap_dotdot: No longer aborts after ATF update
It appears this test no longer fails after
c203bd70b5957f85616424b6fa374479372d06e3.
PR: 215690
---
tests/sys/vfs/lookup_cap_dotdot.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/tests/sys/vfs/lookup_cap_dotdot.c
b/tests/sys/vfs/lookup_cap_dotdot.c
index 6363471d55ff..dee1e0b11780 100644
--- a/tests/sys/vfs/lookup_cap_dotdot.c
+++ b/tests/sys/vfs/lookup_cap_dotdot.c
@@ -80,6 +80,7 @@ check_capsicum(void)
{
ATF_REQUIRE_FEATURE("security_capabilities");
ATF_REQUIRE_FEATURE("security_capability_mode");
+ ATF_REQUIRE_SYSCTL_INT("kern.trap_enotcap", 0);
}
/*
@@ -124,8 +125,6 @@ ATF_TC_BODY(lookup_cap_dotdot__basic, tc)
cap_rights_init(&rights, CAP_LOOKUP, CAP_READ);
ATF_REQUIRE(cap_rights_limit(dirfd, &rights) >= 0);
- atf_tc_expect_signal(SIGABRT, "needs change done upstream in atf/kyua
according to cem: bug 215690");
-
ATF_REQUIRE(cap_enter() >= 0);
ATF_REQUIRE_MSG(openat(dirfd, "d1/..", O_RDONLY) >= 0, "%s",
@@ -146,8 +145,6 @@ ATF_TC_BODY(lookup_cap_dotdot__advanced, tc)
check_capsicum();
prepare_dotdot_tests();
- atf_tc_expect_signal(SIGABRT, "needs change done upstream in atf/kyua
according to cem: bug 215690");
-
cap_rights_init(&rights, CAP_LOOKUP, CAP_READ);
ATF_REQUIRE(cap_rights_limit(dirfd, &rights) >= 0);
@@ -191,8 +188,6 @@ ATF_TC_BODY(capmode__negative, tc)
check_capsicum();
prepare_dotdot_tests();
- atf_tc_expect_signal(SIGABRT, "needs change done upstream in atf/kyua
according to cem: bug 215690");
-
ATF_REQUIRE(cap_enter() == 0);
/* open() not permitted in capability mode */
@@ -231,8 +226,6 @@ ATF_TC_BODY(lookup_cap_dotdot__negative, tc)
cap_rights_init(&rights, CAP_LOOKUP, CAP_READ);
ATF_REQUIRE(cap_rights_limit(dirfd, &rights) >= 0);
- atf_tc_expect_signal(SIGABRT, "needs change done upstream in atf/kyua
according to cem: bug 215690");
-
ATF_REQUIRE(cap_enter() >= 0);
ATF_REQUIRE_ERRNO(ENOTCAPABLE, openat(dirfd, "..", O_RDONLY) < 0);
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
