Integrate:

[ 23179]
Skip test when building without Encode.

[ 23181]
Fix breakage caused by Change 23179

[ 23244]
Skip a Data::Dumper test if configured without B module.

[ 23245]
Fix skipping of a Dumpvalue test when configured without Devel::Peek.

[ 23246]
Skip Time::HiRes tests if configured without that module.
p4raw-link: @23246 on //depot/perl: df2f6354ec75c3a7d7d07975479b72910dca7931
p4raw-link: @23245 on //depot/perl: af3f5016d7b1b8e62e6c41ccf1d2f00957b261d2
p4raw-link: @23244 on //depot/perl: 4543415b4bf727b6d2b807b141805b40a67913b8
p4raw-link: @23181 on //depot/perl: 3a853408f051116868e8714b90365eb2581caf59
p4raw-link: @23179 on //depot/perl: 1f616d559fcb84901480199144ce9065d098670b

p4raw-id: //depot/maint-5.8/perl@23309
p4raw-integrated: from //depot/perl@23308 'copy in' lib/Dumpvalue.t
	(@22998..) ext/Time/HiRes/t/HiRes.t (@23232..) 'merge in'
	ext/Data/Dumper/t/dumper.t (@22926..)
p4raw-integrated: from //depot/perl@23179 'edit in' t/run/fresh_perl.t
	(@23074..)

diff --git a/ext/Data/Dumper/t/dumper.t b/ext/Data/Dumper/t/dumper.t
index 92cd3ef..8a4ce55 100755 (executable)
--- a/ext/Data/Dumper/t/dumper.t
+++ b/ext/Data/Dumper/t/dumper.t
@@ -965,7 +965,11 @@ TEST q(Data::Dumper->new([[$c, $d]])->Dumpxs;)
 #        };
 EOT
 
-  TEST q(Data::Dumper->new([{ foo => sub { print "foo"; } }])->Dump);
+  if(" $Config{'extensions'} " !~ m[ B ]) {
+    SKIP_TEST "Perl configured without B module";
+  } else {
+    TEST q(Data::Dumper->new([{ foo => sub { print "foo"; } }])->Dump);
+  }
 }
 
 ############# 214

diff --git a/ext/Time/HiRes/t/HiRes.t b/ext/Time/HiRes/t/HiRes.t
index 69be80b..5274cef 100644 (file)
--- a/ext/Time/HiRes/t/HiRes.t
+++ b/ext/Time/HiRes/t/HiRes.t
@@ -4,6 +4,11 @@ BEGIN {
     if ($ENV{PERL_CORE}) {
        chdir 't' if -d 't';
        @INC = '../lib';
+       require Config; import Config;
+       if (" $Config{'extensions'} " !~ m[ Time/HiRes ]) {
+           print "1..0 # Skip -- Perl configured without Time::HiRes module\n";
+           exit 0;
+       }
     }
 }
 

diff --git a/lib/Dumpvalue.t b/lib/Dumpvalue.t
index b22b86d..8eb70a3 100644 (file)
--- a/lib/Dumpvalue.t
+++ b/lib/Dumpvalue.t
@@ -205,7 +205,10 @@ is( $out->read, "\$_<foo = 1\n", 'dumped glob for $_<foo correctly (DB)' );
 
 # test CvGV name
 SKIP: {
-       skip( 'no Devel::Peek', 1 ) unless use_ok( 'Devel::Peek' );
+       if (" $Config::Config{'extensions'} " !~ m[ Devel/Peek ]) {
+           skip( 'no Devel::Peek', 2 );
+       }
+       use_ok( 'Devel::Peek' );
        is( $d->CvGV_name(\&TieOut::read), 'TieOut::read', 'CvGV_name found sub' );
 }
 

diff --git a/t/run/fresh_perl.t b/t/run/fresh_perl.t
index dd3629c..6f99451 100644 (file)
--- a/t/run/fresh_perl.t
+++ b/t/run/fresh_perl.t
@@ -857,6 +857,7 @@ EXPECT
 ./"TEST"
 ######## "Segfault using HTML::Entities", Richard Jolly <richardjolly@mac.com>, <A3C7D27E-C9F4-11D8-B294-003065AE00B6@mac.com> in perl-unicode@perl.org
 -lw
+# SKIP: " $Config::Config{'extensions'} " !~ m[ Encode ] # Perl configured without Encode module
 BEGIN {
   eval 'require Encode';
   if ($@) { exit 0 } # running minitest?