Integrate mainline

p4raw-id: //depot/perlio@16385

3 files changed, 13 insertions, 10 deletions

diff --git a/t/TestInit.pm b/t/TestInit.pm
index a2a074e13f..f33ee1294b 100644
--- a/t/TestInit.pm
+++ b/t/TestInit.pm
@@ -1,5 +1,5 @@
 # This is a replacement for the old BEGIN preamble which heads (or
-# should head) up every core test program to prep it for running.  
+# should head) up every core test program to prepare it for running.
 # Now instead of:
 #
 # BEGIN {
@@ -7,11 +7,11 @@
 #   @INC = '../lib';
 # }
 #
-# t/TEST will use -MTestInit.  It also doesn't hurt if you "use TestInit"
-# (not require) in the test scripts.
+# t/TEST will use -MTestInit.  You may "use TestInit" in the test
+# programs but it is not required.
 #
-# PS this is not POD because this should be a very minimalist module in
-# case of funaemental perl breakage.
+# P.S. This documentation is not in POD format in order to avoid
+# problems when there are fundamental bugs in perl.
 
 package TestInit;
 
diff --git a/t/lib/1_compile.t b/t/lib/1_compile.t
index 1af3ecf6e8..069121531c 100644
--- a/t/lib/1_compile.t
+++ b/t/lib/1_compile.t
@@ -18,9 +18,12 @@ use File::Spec::Functions;
 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);
+if (eval { require Socket }) {
+  push @Core_Modules, qw(Net::Domain);
+  # 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;
@@ -74,7 +77,6 @@ ExtUtils::MM_NW5
 ExtUtils::Install
 ExtUtils::Liblist
 ExtUtils::Mksymlists
-Net::Domain
 O
 Pod::Plainer
 Test::Harness::Iterator
diff --git a/t/op/alarm.t b/t/op/alarm.t
index c008737dff..384ee1d028 100644
--- a/t/op/alarm.t
+++ b/t/op/alarm.t
@@ -45,6 +45,7 @@ $diff = time - $start_time;
 is( $@, "ALARM!\n",             'alarm w/$SIG{ALRM} vs system()' );
 
 {
-    local $TODO = 'Why does system() block alarm() on VMS?' if $^O eq 'VMS';
+    local $TODO = "Why does system() block alarm() on $^O?"
+		if $^O eq 'VMS' || $^O eq'MacOS';
     ok( abs($diff - 3) <= 1,   "   right time (waited $diff secs for 3-sec alarm)" );
 }