Merge branch 'jk/maint-t1304-setfacl'
Works around a false test failure caused by a bug in ecryptofs. * jk/maint-t1304-setfacl: t1304: improve setfacl prerequisite setup
This commit is contained in:
commit
2a6291e97a
@ -14,16 +14,15 @@ umask 077
|
||||
# We need an arbitrary other user give permission to using ACLs. root
|
||||
# is a good candidate: exists on all unices, and it has permission
|
||||
# anyway, so we don't create a security hole running the testsuite.
|
||||
|
||||
setfacl_out="$(setfacl -m u:root:rwx . 2>&1)"
|
||||
setfacl_ret=$?
|
||||
|
||||
if test $setfacl_ret != 0
|
||||
then
|
||||
say "Unable to use setfacl (output: '$setfacl_out'; return code: '$setfacl_ret')"
|
||||
else
|
||||
test_set_prereq SETFACL
|
||||
fi
|
||||
test_expect_success 'checking for a working acl setup' '
|
||||
if setfacl -m d:m:rwx -m u:root:rwx . &&
|
||||
getfacl . | grep user:root:rwx &&
|
||||
touch should-have-readable-acl &&
|
||||
getfacl should-have-readable-acl | egrep "mask::?rw-"
|
||||
then
|
||||
test_set_prereq SETFACL
|
||||
fi
|
||||
'
|
||||
|
||||
if test -z "$LOGNAME"
|
||||
then
|
||||
|
Loading…
Reference in New Issue
Block a user