diff options
| author | Brandon Casey <drafnel@gmail.com> | 2010-03-15 12:14:37 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-16 19:06:01 -0700 |
| commit | 80700fde91e4a57897d811aa40daf9251b39c77c (patch) | |
| tree | 15fe874e35c8621a3bf93e06ebc43fb35c9302d0 /t/t1304-default-acl.sh | |
| parent | 2e85575a0216b5ad4b1209cea77e1a2769fbd0b7 (diff) | |
| download | git-80700fde91e4a57897d811aa40daf9251b39c77c.tar.gz | |
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-x | t/t1304-default-acl.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh index 85351aea24..055ad00f77 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 } |