X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Fgroups.t;h=695f9897539895e734106a4582c8146801c3f1d9;hb=69938bbac29d5bcb76b80f6eccb27c5ff84cee37;hp=77dbb2b2966b2c5c0414ff7fcb41371106aa7d76;hpb=58c2ef1935bc22d76403b75989b56de9eecb6730;p=p5sagit%2Fp5-mst-13.2.git diff --git a/t/op/groups.t b/t/op/groups.t index 77dbb2b..695f989 100755 --- a/t/op/groups.t +++ b/t/op/groups.t @@ -121,8 +121,8 @@ $seen{$pwgid}++; print "# pwgid = $pwgid, pwgnam = $pwgnam\n"; for (split(' ', $()) { - next if $seen{$_}++; ($group) = getgrgid($_); + next if (! defined $group or ! grep { $_ eq $group } @gr) and $seen{$_}++; if (defined $group) { push(@gr, $group); } @@ -133,7 +133,7 @@ for (split(' ', $()) { print "# gr = @gr\n"; -if ($^O =~ /^(?:uwin|solaris)$/) { +if ($^O =~ /^(?:uwin|cygwin|solaris)$/) { # Or anybody else who can have spaces in group names. $gr1 = join(' ', grep(!$did{$_}++, sort split(' ', join(' ', @gr)))); } else {