Integrate from mainperl.

p4raw-id: //depot/cfgperl@2948

3 files changed, 18 insertions, 7 deletions

diff --git a/t/io/argv.t b/t/io/argv.t
index cb2ffb346e..c6565dc9c7 100755
--- a/t/io/argv.t
+++ b/t/io/argv.t
@@ -46,7 +46,7 @@ else
 open(try, '>Io.argv.tmp') or die "Can't open temp file: $!";
 close try;
 @ARGV = 'Io.argv.tmp';
-$^I = '';
+$^I = '.bak';
 $/ = undef;
 while (<>) {
     s/^/ok 6\n/;
@@ -56,4 +56,4 @@ open(try, '<Io.argv.tmp') or die "Can't open temp file: $!";
 print while <try>;
 close try;
 
-END { unlink 'Io.argv.tmp' }
+END { unlink 'Io.argv.tmp', 'Io.argv.tmp.bak' }
diff --git a/t/lib/bigfloatpm.t b/t/lib/bigfloatpm.t
index 566038ec04..9f624823dc 100755
--- a/t/lib/bigfloatpm.t
+++ b/t/lib/bigfloatpm.t
@@ -49,7 +49,17 @@ while (<DATA>) {
                }
                #print ">>>",$try,"<<<\n";
                $ans1 = eval $try;
-               if ("$ans1" eq $ans) { #bug!
+	       if ($ans =~ m|^/(.*)$|) {
+	           my $pat = $1;
+		   if ($ans1 =~ /$pat/) {
+                       print "ok $test\n";
+		   }
+		   else {
+                       print "not ok $test\n";
+                       print "# '$try' expected: /$pat/ got: '$ans1'\n";
+		   }
+	       }
+               elsif ("$ans1" eq $ans) { #bug!
                        print "ok $test\n";
                } else {
                        print "not ok $test\n";
@@ -429,10 +439,10 @@ $Math::BigFloat::div_scale = 20
 $Math::BigFloat::div_scale = 40
 &fsqrt
 +0:0
--1:NaN
--2:NaN
--16:NaN
--123.456:NaN
+-1:/^(0|NaN)$
+-2:/^(0|NaN)$
+-16:/^(0|NaN)$
+-123.456:/^(0|NaN)$
 +1:1.
 +1.44:1.2
 +2:1.41421356237309504880168872420969807857
diff --git a/t/lib/h2ph.t b/t/lib/h2ph.t
index 467e6965ab..acb150dfcd 100755
--- a/t/lib/h2ph.t
+++ b/t/lib/h2ph.t
@@ -31,4 +31,5 @@ unless(-e '../utils/h2ph') {
     
     # cleanup - should this be in an END block?
     unlink("lib/h2ph.ph");
+    unlink("_h2ph_pre.ph");
 }