t/t1304: use 'test -r' to test readability rather than looking at mode bits

This test was using the group read permission bit as an indicator of the
default ACL mask.  This behavior is valid on Linux but not on other
platforms like Solaris.  So, rather than looking at mode bits, just test
readability for the user.  This, along with the checks for the existence
of the ACL's that were set on the parent directories, should be enough.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Casey 2010-03-15 12:14:35 -05:00 committed by Junio C Hamano
parent ab04a90567
commit 71c4d6c635

View File

@ -20,21 +20,8 @@ if ! setfacl -m u:root:rwx .; then
test_done
fi
modebits () {
ls -l "$1" | sed -e 's|^\(..........\).*|\1|'
}
check_perms_and_acl () {
actual=$(modebits "$1") &&
case "$actual" in
-r--r-----*)
: happy
;;
*)
echo "Got permission '$actual', expected '-r--r-----'"
false
;;
esac &&
test -r "$1" &&
getfacl "$1" > actual &&
grep -q "user:root:rwx" actual &&
grep -q "user:${LOGNAME}:rwx" actual &&