Change 18936: Integrate from maint-5.8/perl

Change 18936 by pudge@pudge-mobile on 2003/03/12 03:02:22

	Integrate from maint-5.8/perl

Affected files ...

... //depot/maint-5.8/macperl/t/op/recurse.t#3 integrate
... //depot/maint-5.8/macperl/t/op/sprintf.t#4 integrate

Differences ...

==== //depot/maint-5.8/macperl/t/op/recurse.t#3 (xtext) ====
Index: macperl/t/op/recurse.t
--- macperl/t/op/recurse.t#2~18199~	Wed Nov 27 21:20:16 2002
+++ macperl/t/op/recurse.t	Tue Mar 11 19:02:22 2003
@@ -113,8 +113,19 @@
 }
 
 # check ok for recursion depth > 65536
-is(runperl(
-	nolib => 1,
-	prog => q{$d=0; $e=1; sub c { ++$d; if ($d > 66000) { $e=0 } else { c(); c() unless $d % 32768 } --$d } c(); exit $e},
-), '', "64K deep recursion - no output expected");
-is($?, 0, "64K deep recursion - no coredump expected");
+{
+    my $r;
+    eval { 
+	$r = runperl(
+		     nolib => 1,
+		     stderr => 1,
+		     prog => q{$d=0; $e=1; sub c { ++$d; if ($d > 66000) { $e=0 } else { c(); c() unless $d % 32768 } --$d } c(); exit $e});
+    };
+  SKIP: {
+      skip("Out of memory -- increase your data/heap?", 2)
+	  if $r =~ /Out of memory/i;
+      is($r, '', "64K deep recursion - no output expected");
+      is($?,  0, "64K deep recursion - no coredump expected");
+  }
+}
+

==== //depot/maint-5.8/macperl/t/op/sprintf.t#4 (xtext) ====
Index: macperl/t/op/sprintf.t
--- macperl/t/op/sprintf.t#3~18901~	Mon Mar 10 20:00:40 2003
+++ macperl/t/op/sprintf.t	Tue Mar 11 19:02:22 2003
@@ -104,7 +104,7 @@
     }
 }
 
-# In each of the the following lines, there are three required fields:
+# In each of the following lines, there are three required fields:
 # printf template, data to be formatted (as a Perl expression), and
 # expected result of formatting.  An optional fourth field can contain
 # a comment.  Each field is delimited by a starting '>' and a
End of Patch.