Integrate with Sarathy.

p4raw-id: //depot/cfgperl@3809

2 files changed, 10 insertions, 2 deletions

diff --git a/t/op/grent.t b/t/op/grent.t
index c9d3797533..761d8b9cf6 100755
--- a/t/op/grent.t
+++ b/t/op/grent.t
@@ -77,7 +77,11 @@ while (<GR>) {
 	warn "# Your $where line $. is empty.\n";
 	next;
     }
-    last if $n == $max;
+    if ($n == $max) {
+	local $/;
+	my $junk = <GR>;
+	last;
+    }
     # In principle we could whine if @s != 4 but do we know enough
     # of group file formats everywhere?
     if (@s == 4) {
diff --git a/t/op/pwent.t b/t/op/pwent.t
index 788d2f2701..ca14a99eec 100755
--- a/t/op/pwent.t
+++ b/t/op/pwent.t
@@ -79,7 +79,11 @@ while (<PW>) {
 	warn "# Your $where line $. is empty.\n";
 	next;
     }
-    last if $n == $max;
+    if ($n == $max) {
+	local $/;
+	my $junk = <PW>;
+	last;
+    }
     # In principle we could whine if @s != 7 but do we know enough
     # of passwd file formats everywhere?
     if (@s == 7) {