diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:39 -0700 |
| commit | a59cb82a2f77c510d62d7d27f197451545f386ab (patch) | |
| tree | 17428706fe4694777b7ab53b76bb94024e56036f | |
| parent | Merge branch 'ja/send-email-ehlo' (diff) | |
| parent | t/t1304: make a second colon optional in the mask ACL check (diff) | |
| download | tgif-a59cb82a2f77c510d62d7d27f197451545f386ab.tar.xz | |
Merge branch 'bc/acl-test'
* bc/acl-test:
t/t1304: make a second colon optional in the mask ACL check
t/t1304: set the ACL effective rights mask
t/t1304: use 'test -r' to test readability rather than looking at mode bits
t/t1304: set the Default ACL base entries
t/t1304: avoid -d option to setfacl
| -rwxr-xr-x | t/t1304-default-acl.sh | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh index cc30be4a65..055ad00f77 100755 --- a/t/t1304-default-acl.sh +++ b/t/t1304-default-acl.sh @@ -20,34 +20,23 @@ 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 && - grep -q "mask::r--" actual && + egrep "mask::?r--" actual > /dev/null 2>&1 && grep -q "group::---" actual || false } dirs_to_set="./ .git/ .git/objects/ .git/objects/pack/" test_expect_success 'Setup test repo' ' + setfacl -m d:u::rwx,d:g::---,d:o:---,d:m:rwx $dirs_to_set && + setfacl -m m:rwx $dirs_to_set && setfacl -m u:root:rwx $dirs_to_set && - setfacl -d -m u:"$LOGNAME":rwx $dirs_to_set && - setfacl -d -m u:root:rwx $dirs_to_set && + setfacl -m d:u:"$LOGNAME":rwx $dirs_to_set && + setfacl -m d:u:root:rwx $dirs_to_set && touch file.txt && git add file.txt && |