git: 885a35c07b60 - stable/15 - tests: Fix reliability issues in POSIX ACL tests
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 02 Jun 2026 16:42:12 UTC
The branch stable/15 has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=885a35c07b60a3b8d1148756b52eac74403f5c5d
commit 885a35c07b60a3b8d1148756b52eac74403f5c5d
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-05-28 12:26:26 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-06-02 16:41:38 +0000
tests: Fix reliability issues in POSIX ACL tests
The ACL tests use UIDs and GIDs 41 through 49 and expect them to be
unassigned. Since GID 43 is now assigned to the audio group, some
tests have begun to fail.
While here, also fix a benign Perl syntax issue in the test runner.
MFC after: 1 week
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D57297
(cherry picked from commit 05039fda7ee12f3b857e55a461607b5af7b6c91f)
---
tests/sys/acl/run | 2 +-
tests/sys/acl/tools-posix.test | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/sys/acl/run b/tests/sys/acl/run
index f8e9c8d87f71..42dbc7373f7f 100644
--- a/tests/sys/acl/run
+++ b/tests/sys/acl/run
@@ -105,7 +105,7 @@ if (isatty(fileno(STDOUT))) {
}
}
print $status, "\n";
-exit $failed ? 1 : 0;
+exit($failed ? 1 : 0);
sub process_test($$$$) {
diff --git a/tests/sys/acl/tools-posix.test b/tests/sys/acl/tools-posix.test
index 2b2a27d24a0d..aa92911761a6 100644
--- a/tests/sys/acl/tools-posix.test
+++ b/tests/sys/acl/tools-posix.test
@@ -80,7 +80,7 @@ $ getfacl -qh lll
> group::r-x
> other::r-x
-$ getfacl -q lll
+$ getfacl -nq lll
> user::rw-
> user:42:r--
> group::r--
@@ -89,7 +89,7 @@ $ getfacl -q lll
> other::r--
$ setfacl -hm u:44:x,g:45:w lll
-$ getfacl -h lll
+$ getfacl -hn lll
> # file: lll
> # owner: root
> # group: wheel
@@ -111,7 +111,7 @@ $ rm lll
# Test removing entries.
$ setfacl -x user:42: xxx
-$ getfacl xxx
+$ getfacl -n xxx
> # file: xxx
> # owner: root
> # group: wheel
@@ -369,7 +369,7 @@ $ rm ddd/xxx
$ setfacl -dm u::rwx,g::rx,o::rx,mask::rwx ddd
$ setfacl -dm g:42:rwx,u:43:r ddd
-$ getfacl -dq ddd
+$ getfacl -dnq ddd
> user::rwx
> user:43:r--
> group::r-x
@@ -378,7 +378,7 @@ $ getfacl -dq ddd
> other::r-x
$ touch ddd/xxx
-$ getfacl -q ddd/xxx
+$ getfacl -nq ddd/xxx
> user::rw-
> user:43:r--
> group::r-x # effective: r--
@@ -387,7 +387,7 @@ $ getfacl -q ddd/xxx
> other::r--
$ mkdir ddd/ddd
-$ getfacl -q ddd/ddd
+$ getfacl -nq ddd/ddd
> user::rwx
> user:43:r--
> group::r-x
@@ -405,7 +405,7 @@ $ ls -l fff | cut -d' ' -f1
> prw-r--r--
$ setfacl -m u:42:r,g:43:w fff
-$ getfacl fff
+$ getfacl -n fff
> # file: fff
> # owner: root
> # group: wheel