From 732266dc6ae9a10c35695fe9bd9850ecaa70acb6 Mon Sep 17 00:00:00 2001 From: "H.Merijn Brand" Date: Mon, 11 Feb 2002 20:30:36 +0100 Subject: [PATCH] Re: perl@14647 Message-Id: <20020211192820.C199.H.M.BRAND@hccnet.nl> p4raw-id: //depot/perl@14682 --- t/op/groups.t | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/t/op/groups.t b/t/op/groups.t index 4d3dcaf..77dbb2b 100755 --- a/t/op/groups.t +++ b/t/op/groups.t @@ -116,11 +116,6 @@ 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"; @@ -145,12 +140,28 @@ if ($^O =~ /^(?:uwin|solaris)$/) { $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"; -- 2.7.4