Integrate mainline

p4raw-id: //depot/perlio@15545

4 files changed, 43 insertions, 14 deletions

diff --git a/t/io/fs.t b/t/io/fs.t
index e7a7cb7fa1..9feed5f1db 100755
--- a/t/io/fs.t
+++ b/t/io/fs.t
@@ -66,7 +66,7 @@ chdir './tmp';
 umask(022);
 
 SKIP: {
-    skip "bogus umask", 1 if ($^O eq 'MSWin32') || ($^O eq 'NetWare');
+    skip "bogus umask", 1 if ($^O eq 'MSWin32') || ($^O eq 'NetWare') ||  ($^O eq 'epoc'); 
 
     is((umask(0)&0777), 022, 'umask'),
 }
@@ -98,11 +98,11 @@ SKIP: {
         skip "hard links not that hard in $^O", 1 if $^O eq 'amigaos';
 	skip "no mode checks", 1 if $skip_mode_checks;
 
-	if ($^O eq 'cygwin') { # new files on cygwin get rwx instead of rw-
-	    is($mode & 0777, 0777, "mode of triply-linked file");
-	} else {
+#      if ($^O eq 'cygwin') { # new files on cygwin get rwx instead of rw-
+#          is($mode & 0777, 0777, "mode of triply-linked file");
+#      } else {
             is($mode & 0777, 0666, "mode of triply-linked file");
-	}
+#      }
     }
 }
 
diff --git a/t/lib/1_compile.t b/t/lib/1_compile.t
index 18b0d0557a..921aa6fb08 100644
--- a/t/lib/1_compile.t
+++ b/t/lib/1_compile.t
@@ -14,9 +14,16 @@ use warnings;
 
 # Okay, this is the list.
 
-my @Core_Modules = grep /\S/, sort <DATA>;
+my @Core_Modules = grep /\S/, <DATA>;
 chomp @Core_Modules;
 
+# Two Net:: modules need the Convert::EBCDIC if in EBDCIC.
+if (ord("A") != 193 || eval { require Convert::EBCDIC }) {
+    push @Core_Modules, qw(Net::Cmd Net::POP3);
+}
+
+@Core_Modules = sort @Core_Modules;
+
 print "1..".(1+@Core_Modules)."\n";
 
 my $message
@@ -61,9 +68,7 @@ ExtUtils::MM_NW5
 ExtUtils::Install
 ExtUtils::Liblist
 ExtUtils::Mksymlists
-Net::Cmd
 Net::Domain
-Net::POP3
 O
 Pod::Plainer
 Test::Harness::Iterator
diff --git a/t/lib/Math/BigInt/Subclass.pm b/t/lib/Math/BigInt/Subclass.pm
index 0ec798b2ef..688ad23769 100644
--- a/t/lib/Math/BigInt/Subclass.pm
+++ b/t/lib/Math/BigInt/Subclass.pm
@@ -6,12 +6,12 @@ require 5.005_02;
 use strict;
 
 use Exporter;
-use Math::BigInt(1.49);
+use Math::BigInt(1.56);
 use vars qw($VERSION @ISA $PACKAGE @EXPORT_OK
             $accuracy $precision $round_mode $div_scale);
 
 @ISA = qw(Exporter Math::BigInt);
-@EXPORT_OK = qw(bgcd);
+@EXPORT_OK = qw(bgcd objectify);
 
 $VERSION = 0.03;
 
@@ -46,11 +46,36 @@ sub blcm
   Math::BigInt::blcm(@_);
   }
 
+BEGIN
+  {
+  *objectify = \&Math::BigInt::objectify;
+
+  # these are called by AUTOLOAD from BigFloat, so we need at least these.
+  # We cheat, of course..
+  *bneg = \&Math::BigInt::bneg;
+  *babs = \&Math::BigInt::babs;
+  *bnan = \&Math::BigInt::bnan;
+  *binf = \&Math::BigInt::binf;
+  *bzero = \&Math::BigInt::bzero;
+  *bone = \&Math::BigInt::bone;
+  }
+
 sub import
   {
   my $self = shift;
-  $self->SUPER::import(@_);                     # need it for subclasses
-  #$self->export_to_level(1,$self,@_);           # need this ?
+
+  my @a; my $t = 0;
+  foreach (@_)
+    {
+    $t = 0, next if $t == 1;
+    if ($_ eq 'lib')
+      {
+      $t = 1; next;
+      }
+    push @a,$_;
+    }
+  $self->SUPER::import(@a);			# need it for subclasses
+  $self->export_to_level(1,$self,@a);		# need this ?
   }
 
 1;
diff --git a/t/lib/warnings/perlio b/t/lib/warnings/perlio
index 5848668a4b..85aa5f2261 100644
--- a/t/lib/warnings/perlio
+++ b/t/lib/warnings/perlio
@@ -48,8 +48,7 @@ perlio: argument list not closed for layer "aa(" at - line 6.
 # perlio [PerlIO_parse_layers]
 no warnings 'layer';
 open(F, ">:xyz", "bb");
-#use warnings 'layer';
-use warnings ;
+use warnings 'layer';
 open(F, ">:xyz", "bb");
 EXPECT
 perlio: unknown layer "xyz".