[Module-build-checkins] Module-Build/t basic.t,1.50,1.51 compat.t,1.36,1.37 destinations.t,1.40,1.41
Status: Beta
Brought to you by:
kwilliams
From: Ken W. <kwi...@us...> - 2006-01-09 01:18:30
|
Update of /cvsroot/module-build/Module-Build/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20993/t Modified Files: basic.t compat.t destinations.t ext.t extend.t files.t install.t manifypods.t metadata.t metadata2.t moduleinfo.t notes.t parents.t pod_parser.t ppm.t runthrough.t signature.t tilde.t versions.t xs.t Log Message: Changes from Yitzchak to make us core-able Index: files.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/files.t,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- files.t 29 Dec 2005 03:12:44 -0000 1.13 +++ files.t 9 Jan 2006 01:18:15 -0000 1.14 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 6; use Cwd (); Index: signature.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/signature.t,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- signature.t 29 Dec 2005 03:12:44 -0000 1.17 +++ signature.t 9 Jan 2006 01:18:15 -0000 1.18 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest; if ( $ENV{TEST_SIGNATURE} ) { Index: extend.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/extend.t,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- extend.t 29 Dec 2005 03:12:44 -0000 1.21 +++ extend.t 9 Jan 2006 01:18:15 -0000 1.22 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 52; use Cwd (); Index: ext.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/ext.t,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ext.t 29 Dec 2005 03:12:44 -0000 1.18 +++ ext.t 9 Jan 2006 01:18:15 -0000 1.19 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest; my @unix_splits = Index: pod_parser.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/pod_parser.t,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- pod_parser.t 29 Dec 2005 03:12:44 -0000 1.6 +++ pod_parser.t 9 Jan 2006 01:18:15 -0000 1.7 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 7; use Cwd (); Index: compat.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/compat.t,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- compat.t 29 Dec 2005 03:12:43 -0000 1.36 +++ compat.t 9 Jan 2006 01:18:15 -0000 1.37 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest; use File::Spec; use Config; Index: basic.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/basic.t,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- basic.t 29 Dec 2005 03:01:48 -0000 1.50 +++ basic.t 9 Jan 2006 01:18:15 -0000 1.51 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 55; use Cwd (); @@ -19,7 +19,10 @@ use_ok 'Module::Build'; -like $INC{'Module/Build.pm'}, qr/\bblib\b/, "Make sure Module::Build was loaded from blib/"; +SKIP: { + skip "no blib in core", 1 if $ENV{PERL_CORE}; + like $INC{'Module/Build.pm'}, qr/\bblib\b/, "Make sure Module::Build was loaded from blib/"; +} # Test object creation Index: ppm.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/ppm.t,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ppm.t 29 Dec 2005 03:12:44 -0000 1.7 +++ ppm.t 9 Jan 2006 01:18:15 -0000 1.8 @@ -1,24 +1,18 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest; use Module::Build; +use Module::Build::ConfigData; -my( $manpage_support, $HTML_support ); - -{ local $SIG{__WARN__} = sub {}; - - my $mb = Module::Build->current; - $mb->verbose( 0 ); - - $manpage_support = $mb->feature('manpage_support'); - $HTML_support = $mb->feature('HTML_support'); +my $manpage_support = Module::Build::ConfigData->feature('manpage_support'); +my $HTML_support = Module::Build::ConfigData->feature('HTML_support'); - my $have_c_compiler; - stderr_of( sub {$have_c_compiler = $mb->have_c_compiler} ); - if ( ! $mb->feature('C_support') ) { +{ + my ($have_c_compiler, $C_support_feature) = check_compiler(); + if (! $C_support_feature) { plan skip_all => 'C_support not enabled'; } elsif ( ! $have_c_compiler ) { plan skip_all => 'C_support enabled, but no compiler found'; Index: xs.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/xs.t,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- xs.t 29 Dec 2005 03:12:44 -0000 1.37 +++ xs.t 9 Jan 2006 01:18:15 -0000 1.38 @@ -1,19 +1,14 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest; use Module::Build; -{ local $SIG{__WARN__} = sub {}; - - my $mb = Module::Build->current; - $mb->verbose( 0 ); - - my $have_c_compiler; - stderr_of( sub {$have_c_compiler = $mb->have_c_compiler} ); +{ + my ($have_c_compiler, $C_support_feature) = check_compiler(); - if ( ! $mb->feature('C_support') ) { + if (! $C_support_feature) { plan skip_all => 'C_support not enabled'; } elsif ( !$have_c_compiler ) { plan skip_all => 'C_support enabled, but no compiler found'; Index: manifypods.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/manifypods.t,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- manifypods.t 29 Dec 2005 03:12:44 -0000 1.21 +++ manifypods.t 9 Jan 2006 01:18:15 -0000 1.22 @@ -1,11 +1,12 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest; use Module::Build; +use Module::Build::ConfigData; -if ( Module::Build->current->feature('manpage_support') ) { +if ( Module::Build::ConfigData->feature('manpage_support') ) { plan tests => 21; } else { plan skip_all => 'manpage_support feature is not enabled'; Index: destinations.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/destinations.t,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- destinations.t 29 Dec 2005 03:12:43 -0000 1.40 +++ destinations.t 9 Jan 2006 01:18:15 -0000 1.41 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 92; use Cwd (); Index: runthrough.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/runthrough.t,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- runthrough.t 29 Dec 2005 03:12:44 -0000 1.62 +++ runthrough.t 9 Jan 2006 01:18:15 -0000 1.63 @@ -1,11 +1,12 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 28; use Module::Build; +use Module::Build::ConfigData; -my $have_yaml = Module::Build->current->feature('YAML_support'); +my $have_yaml = Module::Build::ConfigData->feature('YAML_support'); ######################### @@ -40,7 +41,9 @@ ok 1; require Module::Build; -ok $INC{'Module/Build.pm'}, qr/blib/, 'Module::Build should be loaded from blib'; +skip $ENV{PERL_CORE} && "no blib in core", + $INC{'Module/Build.pm'}, qr/blib/, 'Module::Build should be loaded from blib'; + print "# Cwd: ", Module::Build->cwd, "\n"; print "# \@INC: (@INC)\n"; print "Done.\n"; # t/compat.t looks for this @@ -62,7 +65,10 @@ use Module::Build; ok(1); -like $INC{'Module/Build.pm'}, qr/\bblib\b/, "Make sure version from blib/ is loaded"; +SKIP: { + skip "no blib in core", 1 if $ENV{PERL_CORE}; + like $INC{'Module/Build.pm'}, qr/\bblib\b/, "Make sure version from blib/ is loaded"; +} ######################### Index: moduleinfo.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/moduleinfo.t,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- moduleinfo.t 29 Dec 2005 03:12:44 -0000 1.15 +++ moduleinfo.t 9 Jan 2006 01:18:15 -0000 1.16 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 64; use Cwd (); Index: versions.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/versions.t,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- versions.t 29 Dec 2005 03:12:44 -0000 1.10 +++ versions.t 9 Jan 2006 01:18:15 -0000 1.11 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 2; use Cwd (); Index: parents.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/parents.t,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- parents.t 29 Dec 2005 03:12:44 -0000 1.5 +++ parents.t 9 Jan 2006 01:18:15 -0000 1.6 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 27; ######################### Index: notes.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/notes.t,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- notes.t 29 Dec 2005 03:12:44 -0000 1.18 +++ notes.t 9 Jan 2006 01:18:15 -0000 1.19 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 8; use Cwd (); Index: tilde.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/tilde.t,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- tilde.t 29 Dec 2005 03:12:44 -0000 1.15 +++ tilde.t 9 Jan 2006 01:18:15 -0000 1.16 @@ -3,7 +3,7 @@ # Test ~ expansion from command line arguments. use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 11; use Cwd (); Index: install.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/install.t,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- install.t 29 Dec 2005 03:12:44 -0000 1.31 +++ install.t 9 Jan 2006 01:18:15 -0000 1.32 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 34; use Cwd (); Index: metadata2.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/metadata2.t,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- metadata2.t 29 Dec 2005 03:12:44 -0000 1.10 +++ metadata2.t 9 Jan 2006 01:18:15 -0000 1.11 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 18; use Cwd (); @@ -9,6 +9,7 @@ my $tmp = File::Spec->catdir( $cwd, 't', '_tmp' ); use Module::Build; +use Module::Build::ConfigData; use DistGen; @@ -16,7 +17,7 @@ SKIP: { skip( 'YAML_support feature is not enabled', 4 ) - unless Module::Build->current->feature('YAML_support'); + unless Module::Build::ConfigData->feature('YAML_support'); my $dist = DistGen->new( dir => $tmp, skip_manifest => 1 ); $dist->regen; Index: metadata.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/metadata.t,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- metadata.t 29 Dec 2005 03:12:44 -0000 1.12 +++ metadata.t 9 Jan 2006 01:18:15 -0000 1.13 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use lib 't/lib'; +use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib'; use MBTest tests => 46; use Cwd (); @@ -10,13 +10,14 @@ use Module::Build; -my $has_YAML = Module::Build->current->feature('YAML_support'); +use Module::Build::ConfigData; +my $has_YAML = Module::Build::ConfigData->feature('YAML_support'); use DistGen; my $dist = DistGen->new( dir => $tmp ); $dist->change_file( 'Build.PL', <<"---" ); -use Module::Build; + my \$builder = Module::Build->new( module_name => '@{[$dist->name]}', dist_version => '3.14159265', |