summaryrefslogtreecommitdiff
path: root/t/t1304-default-acl.sh
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2010-03-15 17:14:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-17 02:06:01 (GMT)
commit80700fde91e4a57897d811aa40daf9251b39c77c (patch)
tree15fe874e35c8621a3bf93e06ebc43fb35c9302d0 /t/t1304-default-acl.sh
parent2e85575a0216b5ad4b1209cea77e1a2769fbd0b7 (diff)
downloadgit-80700fde91e4a57897d811aa40daf9251b39c77c.zip
git-80700fde91e4a57897d811aa40daf9251b39c77c.tar.gz
git-80700fde91e4a57897d811aa40daf9251b39c77c.tar.bz2
t/t1304: make a second colon optional in the mask ACL check
Solaris only uses one colon in the listing of the ACL mask, Linux uses two, so substitute egrep for grep and make the second colon optional. The -q option for Solaris 7's /usr/xpg4/bin/egrep does not appear to be implemented, so redirect output to /dev/null. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1304-default-acl.sh')
-rwxr-xr-xt/t1304-default-acl.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index 85351ae..055ad00 100755
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -25,7 +25,7 @@ check_perms_and_acl () {
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
}