Do away with array context, from Daniel Chetlin <daniel@chetlin.com>

[p5sagit/p5-mst-13.2.git] / t / op / grent.t

diff --git a/t/op/grent.t b/t/op/grent.t
index 761d8b9..27c9427 100755 (executable)
--- a/t/op/grent.t
+++ b/t/op/grent.t
@@ -54,9 +54,9 @@ BEGIN {
     }
 }
 
-# By now GR filehandle should be open and full of juicy group entries.
+# By now the GR filehandle should be open and full of juicy group entries.
 
-print "1..1\n";
+print "1..2\n";
 
 # Go through at most this many groups.
 # (note that the first entry has been read away by now)
@@ -67,9 +67,11 @@ my $tst = 1;
 my %perfect;
 my %seen;
 
+setgrent();
 while (<GR>) {
     chomp;
-    my @s = split /:/;
+    # LIMIT -1 so that groups with no users don't fall off
+    my @s = split /:/, $_, -1;
     my ($name_s,$passwd_s,$gid_s,$members_s) = @s;
     if (@s) {
        push @{ $seen{$name_s} }, $.;
@@ -111,6 +113,8 @@ while (<GR>) {
     $n++;
 }
 
+endgrent();
+
 if (keys %perfect == 0) {
     $max++;
     print <<EOEX;
@@ -136,4 +140,29 @@ print "ok ", $tst++;
 print "\t# (not necessarily serious: run t/op/grent.t by itself)" if $not;
 print "\n";
 
+# Test both the scalar and list contexts.
+
+my @gr1;
+
+setgrent();
+for (1..$max) {
+    my $gr = scalar getgrent();
+    last unless defined $gr;
+    push @gr1, $gr;
+}
+endgrent();
+
+my @gr2;
+
+setgrent();
+for (1..$max) {
+    my ($gr) = (getgrent());
+    last unless defined $gr;
+    push @gr2, $gr;
+}
+endgrent();
+
+print "not " unless "@gr1" eq "@gr2";
+print "ok ", $tst++, "\n";
+
 close(GR);