From 80700fde91e4a57897d811aa40daf9251b39c77c Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Mon, 15 Mar 2010 12:14:37 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- t/t1304-default-acl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } -- 2.11.4.GIT