Change 23309 by nicholas@no-spam on 2004/09/10 08:41:17
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.
Affected files ...
... //depot/maint-5.8/perl/ext/Data/Dumper/t/dumper.t#5 integrate
... //depot/maint-5.8/perl/ext/Time/HiRes/t/HiRes.t#6 integrate
... //depot/maint-5.8/perl/lib/Dumpvalue.t#4 integrate
... //depot/maint-5.8/perl/t/run/fresh_perl.t#11 integrate
Differences ...
==== //depot/maint-5.8/perl/ext/Data/Dumper/t/dumper.t#5 (xtext) ====
Index: perl/ext/Data/Dumper/t/dumper.t
--- perl/ext/Data/Dumper/t/dumper.t#4~21049~ Fri Sep 5 06:56:44 2003
+++ perl/ext/Data/Dumper/t/dumper.t Fri Sep 10 01:41:17 2004
@@no-spam -965,7 +965,11 @@no-spam
# };
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
==== //depot/maint-5.8/perl/ext/Time/HiRes/t/HiRes.t#6 (text) ====
Index: perl/ext/Time/HiRes/t/HiRes.t
--- perl/ext/Time/HiRes/t/HiRes.t#5~23273~ Sun Sep 5 15:06:51 2004
+++ perl/ext/Time/HiRes/t/HiRes.t Fri Sep 10 01:41:17 2004
@@no-spam -4,6 +4,11 @@no-spam
if ($ENV{PERL_CORE}) {
chdir 't' if -d 't';
@no-spam = '../lib';
+ require Config; import Config;
+ if (" $Config{'extensions'} " !~ m[ Time/HiRes ]) {
+ print "1..0 # Skip -- Perl configured without Time::HiRes module\n";
+ exit 0;
+ }
}
}
==== //depot/maint-5.8/perl/lib/Dumpvalue.t#4 (text) ====
Index: perl/lib/Dumpvalue.t
--- perl/lib/Dumpvalue.t#3~23035~ Sun Jul 4 13:49:10 2004
+++ perl/lib/Dumpvalue.t Fri Sep 10 01:41:17 2004
@@no-spam -205,7 +205,10 @@no-spam
# 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' );
}
==== //depot/maint-5.8/perl/t/run/fresh_perl.t#11 (text) ====
Index: perl/t/run/fresh_perl.t
--- perl/t/run/fresh_perl.t#10~23261~ Sat Sep 4 13:30:30 2004
+++ perl/t/run/fresh_perl.t Fri Sep 10 01:41:17 2004
@@no-spam -857,6 +857,7 @@no-spam
./"TEST"
######## "Segfault using HTML::Entities", Richard Jolly <richardjolly@no-spam>, <A3C7D27E-C9F4-11D8-B294-003065AE00B6@no-spam> in perl-unicode@no-spam
-lw
+# SKIP: " $Config::Config{'extensions'} " !~ m[ Encode ] # Perl configured without Encode module
BEGIN {
eval 'require Encode';
if ($@no-spam { exit 0 } # running minitest?
End of Patch.