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>
Brandon Casey committed
Mar 15, 2010 at 12:14 UTC
80700fde91e4a57897d811aa40daf9251b39c77c
1 file changed
+1
-1
t/t1304-default-acl.sh
+1
-1
@@ -25,7 +25,7 @@ check_perms_and_acl () {
25
getfacl "$1" > actual &&
26
grep -q "user:root:rwx" actual &&
27
grep -q "user:${LOGNAME}:rwx" actual &&
28
- grep -q "mask::r--" actual &&
28
+ egrep "mask::?r--" actual > /dev/null 2>&1 &&
29
grep -q "group::---" actual || false
30
}
31