From: Brandon Casey <drafnel@gmail.com>
Date: Mon, 15 Mar 2010 17:14:37 +0000 (-0500)
Subject: t/t1304: make a second colon optional in the mask ACL check
X-Git-Tag: v1.7.1-rc0~23^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=80700fde91e4a57897d811aa40daf9251b39c77c;p=git.git

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>
---

diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index 85351aea2..055ad00f7 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
 }