X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Fgroups.t;h=6110fb8c4f589da9813e275ca6d13aeea38927d4;hb=3ab3c9b49fb213f2b1d4cda8797de17be82b2b15;hp=f6355ca1490a4c8b88ead61cfccb65ae4f6fea07;hpb=9380b46b3d37c131ab8ce5026cc41ca0f63d3c60;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/groups.t b/t/op/groups.t
index f6355ca..6110fb8 100755
--- a/t/op/groups.t
+++ b/t/op/groups.t
@@ -6,6 +6,9 @@ $ENV{LC_ALL} = "C"; # so that external utilities speak English
 $ENV{LANGUAGE} = 'C'; # GNU locale extension
 
 BEGIN {
+    chdir 't';
+    @INC = '../lib';
+
     require Config;
     if ($@) {
 	print "1..0 # Skip: no Config\n";
@@ -113,18 +116,13 @@ print "1..2\n";
 
 $pwgid = $( + 0;
 ($pwgnam) = getgrgid($pwgid);
-if ($Config{myuname} =~ /^cygwin_nt/i) { # basegroup on CYGWIN_NT has id = 0.
-    @basegroup{$pwgid,$pwgnam} = (0,0);
-} else {
-    @basegroup{$pwgid,$pwgnam} = (1,1);
-}
 $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);
     }
@@ -135,19 +133,35 @@ for (split(' ', $()) {
 
 print "# gr = @gr\n";
 
-if ($^O =~ /^(?:uwin|solaris)$/) {
+if ($^O =~ /^(?:uwin|cygwin|interix|solaris)$/) {
 	# Or anybody else who can have spaces in group names.
 	$gr1 = join(' ', grep(!$did{$_}++, sort split(' ', join(' ', @gr))));
 } else {
 	$gr1 = join(' ', sort @gr);
 }
 
+if ($Config{myuname} =~ /^cygwin_nt/i) { # basegroup on CYGWIN_NT has id = 0.
+    @basegroup{$pwgid,$pwgnam} = (0,0);
+} else {
+    @basegroup{$pwgid,$pwgnam} = (1,1);
+}
 $gr2 = join(' ', grep(!$basegroup{$_}++, sort split(' ',$groups)));
 
+my $ok1 = 0;
 if ($gr1 eq $gr2 || ($gr1 eq '' && $gr2 eq $pwgid)) {
     print "ok 1\n";
+    $ok1++;
 }
-else {
+elsif ($Config{myuname} =~ /^cygwin_nt/i) { # basegroup on CYGWIN_NT has id = 0.
+    # Retry in default unix mode
+    %basegroup = ( $pwgid => 1, $pwgnam => 1 );
+    $gr2 = join(' ', grep(!$basegroup{$_}++, sort split(' ',$groups)));
+    if ($gr1 eq $gr2 || ($gr1 eq '' && $gr2 eq $pwgid)) {
+	print "ok 1 # This Cygwin behaves like Unix (Win2k?)\n";
+	$ok1++;
+    }
+}
+unless ($ok1) {
     print "#gr1 is <$gr1>\n";
     print "#gr2 is <$gr2>\n";
     print "not ok 1\n";