From 71c4d6c6354036597534931d8fe9e80a9ae3c0af Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Mon, 15 Mar 2010 12:14:35 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- t/t1304-default-acl.sh | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh index 3a1532be55..52246d7393 100755 --- a/t/t1304-default-acl.sh +++ b/t/t1304-default-acl.sh @@ -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 && -- 2.11.4.GIT