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:
Junio C Hamano 2012-06-21 14:42:43 -07:00
commit 2a6291e97a

View File

@ -14,16 +14,15 @@ umask 077
# We need an arbitrary other user give permission to using ACLs. root # We need an arbitrary other user give permission to using ACLs. root
# is a good candidate: exists on all unices, and it has permission # is a good candidate: exists on all unices, and it has permission
# anyway, so we don't create a security hole running the testsuite. # anyway, so we don't create a security hole running the testsuite.
test_expect_success 'checking for a working acl setup' '
setfacl_out="$(setfacl -m u:root:rwx . 2>&1)" if setfacl -m d:m:rwx -m u:root:rwx . &&
setfacl_ret=$? getfacl . | grep user:root:rwx &&
touch should-have-readable-acl &&
if test $setfacl_ret != 0 getfacl should-have-readable-acl | egrep "mask::?rw-"
then then
say "Unable to use setfacl (output: '$setfacl_out'; return code: '$setfacl_ret')" test_set_prereq SETFACL
else fi
test_set_prereq SETFACL '
fi
if test -z "$LOGNAME" if test -z "$LOGNAME"
then then