path: root/t/
diff options
authorJeff King <>2012-06-06 13:28:24 (GMT)
committerJunio C Hamano <>2012-06-07 17:09:02 (GMT)
commita14ad109115b29483b6e37d18159d850e2752c72 (patch)
treeca7cf196a245918659d372aa5065fc7bfd9c22e2 /t/
parentac2604cf5fb9fcf538289a470ecbe345f7f0c220 (diff)
t1304: improve setfacl prerequisite setup
t1304 first runs setfacl as an experiment to see whether the filesystem supports ACLs, and skips the remaining tests if it does not. However, our setfacl run did not exercise the ACLs very well, and some filesystems may support our initial setfacl, but not the rest of the test. In particular, some versions of ecryptfs will erroneously apply the umask on top of an inherited directory ACL, causing our tests to fail. Let's be more careful and make sure both that we can read back the user ACL we set, and that the inherited ACL is propagated correctly. The latter catches the ecryptfs bug, but may also catch other bugs (e.g., an implementation which does not handle inherited ACLs at all). Since we're making the setup more complex, let's move it into its own test. This will hide the output for us unless the user wants to run "-v" to see it (and we don't need to bother printing anything about setfacl failing; the remaining tests will properly print "skip" due to the missing prerequisite). Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 9 insertions, 10 deletions
diff --git a/t/ b/t/
index 2b962cf..79045ab 100755
--- a/t/
+++ b/t/
@@ -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)"
-if test $setfacl_ret != 0
- say "Unable to use setfacl (output: '$setfacl_out'; return code: '$setfacl_ret')"
- test_set_prereq SETFACL
+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"