2 files changed, 54 insertions, 4 deletions

diff --git a/t/op/grent.t b/t/op/grent.t
index 761d8b9cf6..19096a10fc 100755
--- 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)
@@ -136,4 +136,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 array contexts.
+
+my @gr1;
+
+endgrent();
+setgrent();
+for (1..$max) {
+    my $gr = scalar getgrent();
+    last unless defined $gr;
+    push @gr1, $gr;
+}
+
+my @gr2;
+
+endgrent();
+setgrent();
+for (1..$max) {
+    my ($gr) = (getgrent());
+    last unless defined $gr;
+    push @gr2, $gr;
+}
+
+print "not " unless "@gr1" eq "@gr2";
+print "ok ", $tst++, "\n";
+
 close(GR);
diff --git a/t/op/pwent.t b/t/op/pwent.t
index ca14a99eec..bb4b500fb4 100755
--- a/t/op/pwent.t
+++ b/t/op/pwent.t
@@ -55,9 +55,9 @@ BEGIN {
     }
 }
 
-# By now PW filehandle should be open and full of juicy password entries.
+# By now the PW filehandle should be open and full of juicy password entries.
 
-print "1..1\n";
+print "1..2\n";
 
 # Go through at most this many users.
 # (note that the first entry has been read away by now)
@@ -134,4 +134,29 @@ print "ok ", $tst++;
 print "\t# (not necessarily serious: run t/op/pwent.t by itself)" if $not;
 print "\n";
 
+# Test both the scalar and array contexts.
+
+my @pw1;
+
+endpwent();
+setpwent();
+for (1..$max) {
+    my $pw = scalar getpwent();
+    last unless defined $pw;
+    push @pw1, $pw;
+}
+
+my @pw2;
+
+endpwent();
+setpwent();
+for (1..$max) {
+    my ($pw) = (getpwent());
+    last unless defined $pw;
+    push @pw2, $pw;
+}
+
+print "not " unless "@pw1" eq "@pw2";
+print "ok ", $tst++, "\n";
+
 close(PW);