Author: markj
Date: Fri Oct 26 19:03:30 2018
New Revision: 339782
URL: https://svnweb.freebsd.org/changeset/base/339782
Log:
Update and re-enable ACL tests following r332396 and r339781.
PR: 229930
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Modified:
head/tests/sys/acl/Makefile
head/tests/sys/acl/tools-nfs4-psarc.test
head/tests/sys/acl/tools-nfs4.test
head/tests/sys/acl/tools-posix.test
Modified: head/tests/sys/acl/Makefile
==============================================================================
--- head/tests/sys/acl/Makefile Fri Oct 26 19:01:52 2018 (r339781)
+++ head/tests/sys/acl/Makefile Fri Oct 26 19:03:30 2018 (r339782)
@@ -14,11 +14,9 @@ ${PACKAGE}FILES+= tools-posix.test
SCRIPTS+= run
-# Disable 00 and 02 until they've been updated for setfacl's new behavior
-# PR 229930 tests/sys/acl/00:main fails in CI due to unexpected error message
-# TAP_TESTS_SH+= 00
-# TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 00
TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
TAP_TESTS_SH+= 03
TAP_TESTS_SH+= 04
Modified: head/tests/sys/acl/tools-nfs4-psarc.test
==============================================================================
--- head/tests/sys/acl/tools-nfs4-psarc.test Fri Oct 26 19:01:52 2018
(r339781)
+++ head/tests/sys/acl/tools-nfs4-psarc.test Fri Oct 26 19:03:30 2018
(r339782)
@@ -186,7 +186,7 @@ $ ls -l xxx yyy zzz | cut -d' ' -f1
> -rw-r--r--
$ setfacl -m u:42:x:allow,g:43:w:allow nnn xxx yyy zzz
-> setfacl: nnn: stat() failed: No such file or directory
+> setfacl: nnn: acl_get_file() failed: No such file or directory
$ ls -l nnn xxx yyy zzz | cut -d' ' -f1
> ls: nnn: No such file or directory
@@ -215,7 +215,7 @@ $ getfacl -nq nnn xxx yyy zzz
> everyone@:r-----a-R-c--s:-------:allow
$ setfacl -b nnn xxx yyy zzz
-> setfacl: nnn: stat() failed: No such file or directory
+> setfacl: nnn: acl_get_file() failed: No such file or directory
$ ls -l nnn xxx yyy zzz | cut -d' ' -f1
> ls: nnn: No such file or directory
Modified: head/tests/sys/acl/tools-nfs4.test
==============================================================================
--- head/tests/sys/acl/tools-nfs4.test Fri Oct 26 19:01:52 2018
(r339781)
+++ head/tests/sys/acl/tools-nfs4.test Fri Oct 26 19:03:30 2018
(r339782)
@@ -214,7 +214,7 @@ $ ls -l xxx yyy zzz | cut -d' ' -f1
> -rw-r--r--
$ setfacl -m u:42:x:allow,g:43:w:allow nnn xxx yyy zzz
-> setfacl: nnn: stat() failed: No such file or directory
+> setfacl: nnn: acl_get_file() failed: No such file or directory
$ ls -l nnn xxx yyy zzz | cut -d' ' -f1
> ls: nnn: No such file or directory
@@ -252,7 +252,7 @@ $ getfacl -nq nnn xxx yyy zzz
> everyone@:r-----a-R-c--s:-------:allow
$ setfacl -b nnn xxx yyy zzz
-> setfacl: nnn: stat() failed: No such file or directory
+> setfacl: nnn: acl_get_file() failed: No such file or directory
$ ls -l nnn xxx yyy zzz | cut -d' ' -f1
> ls: nnn: No such file or directory
Modified: head/tests/sys/acl/tools-posix.test
==============================================================================
--- head/tests/sys/acl/tools-posix.test Fri Oct 26 19:01:52 2018
(r339781)
+++ head/tests/sys/acl/tools-posix.test Fri Oct 26 19:03:30 2018
(r339782)
@@ -226,7 +226,7 @@ $ ls -l xxx yyy zzz | cut -d' ' -f1
> -rw-r--r--
$ setfacl -m u:42:x,g:43:w nnn xxx yyy zzz
-> setfacl: nnn: stat() failed: No such file or directory
+> setfacl: nnn: acl_get_file() failed: No such file or directory
$ ls -l nnn xxx yyy zzz | cut -d' ' -f1
> ls: nnn: No such file or directory
@@ -258,7 +258,7 @@ $ getfacl -nq nnn xxx yyy zzz
> other::r--
$ setfacl -b nnn xxx yyy zzz
-> setfacl: nnn: stat() failed: No such file or directory
+> setfacl: nnn: acl_get_file() failed: No such file or directory
$ ls -l nnn xxx yyy zzz | cut -d' ' -f1
> ls: nnn: No such file or directory
@@ -267,7 +267,7 @@ $ ls -l nnn xxx yyy zzz | cut -d' ' -f1
> -rw-r--r--+
$ setfacl -bn nnn xxx yyy zzz
-> setfacl: nnn: stat() failed: No such file or directory
+> setfacl: nnn: acl_get_file() failed: No such file or directory
$ ls -l nnn xxx yyy zzz | cut -d' ' -f1
> ls: nnn: No such file or directory
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
