Author: kwilliams
Date: Mon Jan 28 15:13:12 2008
New Revision: 10661
Modified:
Module-Build/trunk/t/basic.t
Module-Build/trunk/t/compat.t
Module-Build/trunk/t/destinations.t
Module-Build/trunk/t/ext.t
Module-Build/trunk/t/extend.t
Module-Build/trunk/t/files.t
Module-Build/trunk/t/help.t
Module-Build/trunk/t/install.t
Module-Build/trunk/t/lib/MBTest.pm
Module-Build/trunk/t/manifypods.t
Module-Build/trunk/t/mbyaml.t
Module-Build/trunk/t/metadata.t
Module-Build/trunk/t/metadata2.t
Module-Build/trunk/t/moduleinfo.t
Module-Build/trunk/t/new_from_context.t
Module-Build/trunk/t/notes.t
Module-Build/trunk/t/par.t
Module-Build/trunk/t/parents.t
Module-Build/trunk/t/pod_parser.t
Module-Build/trunk/t/ppm.t
Module-Build/trunk/t/runthrough.t
Module-Build/trunk/t/signature.t
Module-Build/trunk/t/test_type.t
Module-Build/trunk/t/test_types.t
Module-Build/trunk/t/tilde.t
Module-Build/trunk/t/versions.t
Module-Build/trunk/t/xs.t
Log:
Be more consistent about how we load M::B and check for blib/
Modified: Module-Build/trunk/t/basic.t
==============================================================================
--- Module-Build/trunk/t/basic.t (original)
+++ Module-Build/trunk/t/basic.t Mon Jan 28 15:13:12 2008
@@ -4,6 +4,9 @@
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
use MBTest tests => 52;
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
+
use Cwd ();
my $cwd = Cwd::cwd;
my $tmp = MBTest->tmpdir;
@@ -17,14 +20,6 @@
#########################
-use_ok 'Module::Build';
-
-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
{
my $mb = Module::Build->new( module_name => $dist->name );
Modified: Module-Build/trunk/t/compat.t
==============================================================================
--- Module-Build/trunk/t/compat.t (original)
+++ Module-Build/trunk/t/compat.t Mon Jan 28 15:13:12 2008
@@ -18,11 +18,13 @@
#find_in_path does not understand VMS.
if ( $Config{make} && $^O ne 'VMS' ? find_in_path($Config{make}) : 1 ) {
- plan tests => 37 + @makefile_types*$tests_per_type*2;
+ plan tests => 38 + @makefile_types*$tests_per_type*2;
} else {
plan skip_all => "Don't know how to invoke 'make'";
}
-ok 1, "Loaded";
+
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
#########################
Modified: Module-Build/trunk/t/destinations.t
==============================================================================
--- Module-Build/trunk/t/destinations.t (original)
+++ Module-Build/trunk/t/destinations.t Mon Jan 28 15:13:12 2008
@@ -2,7 +2,10 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 113;
+use MBTest tests => 115;
+
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
use Cwd ();
my $cwd = Cwd::cwd;
@@ -23,7 +26,6 @@
# We need to create a well defined environment to test install paths.
# We do this by setting up appropriate Config entries.
-use Module::Build;
my @installstyle = qw(lib perl5);
my $mb = Module::Build->new_from_context(
installdirs => 'site',
Modified: Module-Build/trunk/t/ext.t
==============================================================================
--- Module-Build/trunk/t/ext.t (original)
+++ Module-Build/trunk/t/ext.t Mon Jan 28 15:13:12 2008
@@ -53,12 +53,12 @@
{ 'a " b " c' => [ 'a', ' b ', 'c' ] },
);
-plan tests => 10 + [EMAIL PROTECTED] + [EMAIL PROTECTED];
+plan tests => 11 + [EMAIL PROTECTED] + [EMAIL PROTECTED];
-#########################
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
-use Module::Build;
-ok(1);
+#########################
# Should always return an array unscathed
foreach my $platform ('', '::Platform::Unix', '::Platform::Windows') {
Modified: Module-Build/trunk/t/extend.t
==============================================================================
--- Module-Build/trunk/t/extend.t (original)
+++ Module-Build/trunk/t/extend.t Mon Jan 28 15:13:12 2008
@@ -2,7 +2,10 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 65;
+use MBTest tests => 66;
+
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
use Cwd ();
my $cwd = Cwd::cwd;
@@ -16,9 +19,6 @@
#########################
-use Module::Build;
-ok 1;
-
# Here we make sure actions are only called once per dispatch()
$::x = 0;
my $mb = Module::Build->subclass
Modified: Module-Build/trunk/t/files.t
==============================================================================
--- Module-Build/trunk/t/files.t (original)
+++ Module-Build/trunk/t/files.t Mon Jan 28 15:13:12 2008
@@ -2,8 +2,12 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 6;
+use MBTest tests => 8;
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
+
+use IO::File;
use Cwd ();
my $cwd = Cwd::cwd;
my $tmp = MBTest->tmpdir;
@@ -15,10 +19,7 @@
chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
-use IO::File;
-
-use Module::Build;
my $mb = Module::Build->new_from_context;
my @files;
Modified: Module-Build/trunk/t/help.t
==============================================================================
--- Module-Build/trunk/t/help.t (original)
+++ Module-Build/trunk/t/help.t Mon Jan 28 15:13:12 2008
@@ -2,7 +2,10 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest 'no_plan';#tests => 0;
+use MBTest tests => 25;
+
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
use Cwd ();
use File::Path ();
@@ -31,8 +34,6 @@
chdir($dist->dirname) or die "Can't chdir to '@{[$dist->dirname]}': $!";
-use_ok 'Module::Build';
-
########################################################################
{ # check the =item style
my $mb = Module::Build->subclass(
Modified: Module-Build/trunk/t/install.t
==============================================================================
--- Module-Build/trunk/t/install.t (original)
+++ Module-Build/trunk/t/install.t Mon Jan 28 15:13:12 2008
@@ -2,8 +2,12 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 34;
+use MBTest tests => 36;
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
+
+use Config;
use Cwd ();
my $cwd = Cwd::cwd;
my $tmp = MBTest->tmpdir;
@@ -16,9 +20,6 @@
#########################
-use Module::Build;
-use Config;
-
$dist->add_file( 'script', <<'---' );
#!perl -w
Modified: Module-Build/trunk/t/lib/MBTest.pm
==============================================================================
--- Module-Build/trunk/t/lib/MBTest.pm (original)
+++ Module-Build/trunk/t/lib/MBTest.pm Mon Jan 28 15:13:12 2008
@@ -54,6 +54,7 @@
find_in_path
check_compiler
have_module
+ ensure_blib
);
push @EXPORT, @extra_exports;
__PACKAGE__->export(scalar caller, @extra_exports);
@@ -163,5 +164,16 @@
return eval "use $module; 1";
}
+sub ensure_blib {
+ # Make sure the given module was loaded from blib/, not the larger system
+ my $mod = shift;
+ (my $path = $mod) =~ s{::}{/}g;
+
+ SKIP: {
+ skip "no blib in core", 1 if $ENV{PERL_CORE};
+ like $INC{"$path.pm"}, qr/\bblib\b/, "Make sure $mod was loaded from
blib/";
+ }
+}
+
1;
# vim:ts=2:sw=2:et:sta
Modified: Module-Build/trunk/t/manifypods.t
==============================================================================
--- Module-Build/trunk/t/manifypods.t (original)
+++ Module-Build/trunk/t/manifypods.t Mon Jan 28 15:13:12 2008
@@ -7,10 +7,12 @@
use Module::Build::ConfigData;
if ( Module::Build::ConfigData->feature('manpage_support') ) {
- plan tests => 21;
+ plan tests => 22;
} else {
plan skip_all => 'manpage_support feature is not enabled';
}
+ensure_blib('Module::Build');
+
#########################
Modified: Module-Build/trunk/t/mbyaml.t
==============================================================================
--- Module-Build/trunk/t/mbyaml.t (original)
+++ Module-Build/trunk/t/mbyaml.t Mon Jan 28 15:13:12 2008
@@ -4,12 +4,14 @@
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
use MBTest 'no_plan';
+use_ok 'Module::Build::YAML';
+ensure_blib('Module::Build::YAML');
+
my ($dir);
$dir = ".";
$dir = "t" if (-d "t");
{
- use_ok("Module::Build::YAML");
my ($expected, $got, $var);
##########################################################
# Test a typical-looking Module::Build structure (alphabetized)
Modified: Module-Build/trunk/t/metadata.t
==============================================================================
--- Module-Build/trunk/t/metadata.t (original)
+++ Module-Build/trunk/t/metadata.t Mon Jan 28 15:13:12 2008
@@ -2,14 +2,15 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 49;
+use MBTest tests => 51;
+
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
use Cwd ();
my $cwd = Cwd::cwd;
my $tmp = MBTest->tmpdir;
-
-use Module::Build;
use Module::Build::ConfigData;
my %metadata =
Modified: Module-Build/trunk/t/metadata2.t
==============================================================================
--- Module-Build/trunk/t/metadata2.t (original)
+++ Module-Build/trunk/t/metadata2.t Mon Jan 28 15:13:12 2008
@@ -2,13 +2,15 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 18;
+use MBTest tests => 20;
+
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
use Cwd ();
my $cwd = Cwd::cwd;
my $tmp = MBTest->tmpdir;
-use Module::Build;
use Module::Build::ConfigData;
use DistGen;
Modified: Module-Build/trunk/t/moduleinfo.t
==============================================================================
--- Module-Build/trunk/t/moduleinfo.t (original)
+++ Module-Build/trunk/t/moduleinfo.t Mon Jan 28 15:13:12 2008
@@ -4,7 +4,10 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 86;
+use MBTest tests => 87;
+
+use_ok 'Module::Build::ModuleInfo';
+ensure_blib('Module::Build::ModuleInfo');
use Cwd ();
my $cwd = Cwd::cwd;
@@ -18,9 +21,6 @@
#########################
-
-use_ok( 'Module::Build::ModuleInfo' );
-
# class method C<find_module_by_name>
my $module = Module::Build::ModuleInfo->find_module_by_name(
'Module::Build::ModuleInfo' );
Modified: Module-Build/trunk/t/new_from_context.t
==============================================================================
--- Module-Build/trunk/t/new_from_context.t (original)
+++ Module-Build/trunk/t/new_from_context.t Mon Jan 28 15:13:12 2008
@@ -2,8 +2,12 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 2;
+use MBTest tests => 4;
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
+
+use IO::File;
use Cwd ();
my $cwd = Cwd::cwd;
my $tmp = MBTest->tmpdir;
@@ -17,8 +21,6 @@
chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
-use IO::File;
-use Module::Build;
unshift(@INC, $libdir);
my $mb = eval { Module::Build->new_from_context};
Modified: Module-Build/trunk/t/notes.t
==============================================================================
--- Module-Build/trunk/t/notes.t (original)
+++ Module-Build/trunk/t/notes.t Mon Jan 28 15:13:12 2008
@@ -2,7 +2,10 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 11;
+use MBTest tests => 13;
+
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
use Cwd ();
my $cwd = Cwd::cwd;
@@ -15,8 +18,6 @@
chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
-use Module::Build;
-
###################################
$dist->change_file( 'Build.PL', <<"---" );
use Module::Build;
Modified: Module-Build/trunk/t/par.t
==============================================================================
--- Module-Build/trunk/t/par.t (original)
+++ Module-Build/trunk/t/par.t Mon Jan 28 15:13:12 2008
@@ -17,9 +17,10 @@
} elsif ( ! eval {require Archive::Zip} ) {
plan skip_all => "Archive::Zip required.";
} else {
- plan tests => 3;
+ plan tests => 4;
}
}
+ensure_blib('Module::Build');
use Cwd ();
Modified: Module-Build/trunk/t/parents.t
==============================================================================
--- Module-Build/trunk/t/parents.t (original)
+++ Module-Build/trunk/t/parents.t Mon Jan 28 15:13:12 2008
@@ -2,12 +2,12 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 27;
+use MBTest tests => 28;
-#########################
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
-use Module::Build;
-ok(1);
+#########################
package Foo;
sub foo;
Modified: Module-Build/trunk/t/pod_parser.t
==============================================================================
--- Module-Build/trunk/t/pod_parser.t (original)
+++ Module-Build/trunk/t/pod_parser.t Mon Jan 28 15:13:12 2008
@@ -2,15 +2,13 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 7;
+use MBTest tests => 8;
-use Cwd ();
-my $cwd = Cwd::cwd;
+use_ok 'Module::Build::PodParser';
+ensure_blib('Module::Build::PodParser');
#########################
-use_ok 'Module::Build::PodParser';
-
{
package IO::StringBased;
Modified: Module-Build/trunk/t/ppm.t
==============================================================================
--- Module-Build/trunk/t/ppm.t (original)
+++ Module-Build/trunk/t/ppm.t Mon Jan 28 15:13:12 2008
@@ -3,13 +3,13 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
use MBTest;
+
use Module::Build;
use Module::Build::ConfigData;
my $manpage_support = Module::Build::ConfigData->feature('manpage_support');
my $HTML_support = Module::Build::ConfigData->feature('HTML_support');
-
{
my ($have_c_compiler, $C_support_feature) = check_compiler();
if (! $C_support_feature) {
@@ -21,9 +21,10 @@
} elsif ( ! eval {IO::Zlib->VERSION(1.01)} ) {
plan skip_all => "IO::Zlib 1.01 required to read compressed archives.";
} else {
- plan tests => 12;
+ plan tests => 13;
}
}
+ensure_blib('Module::Build');
use Cwd ();
Modified: Module-Build/trunk/t/runthrough.t
==============================================================================
--- Module-Build/trunk/t/runthrough.t (original)
+++ Module-Build/trunk/t/runthrough.t Mon Jan 28 15:13:12 2008
@@ -3,9 +3,11 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
use MBTest tests => 32;
-use Module::Build;
-use Module::Build::ConfigData;
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
+
+use Module::Build::ConfigData;
my $have_yaml = Module::Build::ConfigData->feature('YAML_support');
#########################
@@ -57,15 +59,6 @@
chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
-#########################
-
-use Module::Build;
-ok(1);
-
-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";
-}
#########################
Modified: Module-Build/trunk/t/signature.t
==============================================================================
--- Module-Build/trunk/t/signature.t (original)
+++ Module-Build/trunk/t/signature.t Mon Jan 28 15:13:12 2008
@@ -6,7 +6,7 @@
if ( $ENV{TEST_SIGNATURE} ) {
if ( have_module( 'Module::Signature' ) ) {
- plan tests => 13;
+ plan tests => 15;
} else {
plan skip_all => '$ENV{TEST_SIGNATURE} is set, but Module::Signature not
found';
}
@@ -14,6 +14,9 @@
plan skip_all => '$ENV{TEST_SIGNATURE} is not set';
}
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
+
#########################
use Cwd ();
@@ -34,8 +37,6 @@
#########################
-use Module::Build;
-
my $mb = Module::Build->new_from_context;
@@ -56,8 +57,10 @@
my @run_order;
{
local $^W; # Skip 'redefined' warnings
- local *Module::Signature::sign = sub { push @run_order,
'sign' };
- local *Module::Build::Base::ACTION_distmeta = sub { push @run_order,
'distmeta' };
+ local *Module::Signature::sign;
+ *Module::Signature::sign = sub { push @run_order, 'sign' };
+ local *Module::Build::Base::ACTION_distmeta;
+ *Module::Build::Base::ACTION_distmeta = sub { push @run_order, 'distmeta'
};
eval { $mb->dispatch('distdir') };
}
is $@, '';
Modified: Module-Build/trunk/t/test_type.t
==============================================================================
--- Module-Build/trunk/t/test_type.t (original)
+++ Module-Build/trunk/t/test_type.t Mon Jan 28 15:13:12 2008
@@ -2,7 +2,10 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 8;
+use MBTest tests => 9;
+
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
use Cwd ();
my $cwd = Cwd::cwd;
@@ -26,8 +29,6 @@
#########################
-use_ok 'Module::Build';
-
# Here we make sure we can define an action that will test a particular type
$::x = 0;
my $mb = Module::Build->subclass(
Modified: Module-Build/trunk/t/test_types.t
==============================================================================
--- Module-Build/trunk/t/test_types.t (original)
+++ Module-Build/trunk/t/test_types.t Mon Jan 28 15:13:12 2008
@@ -2,7 +2,10 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 14 + 12;
+use MBTest tests => 15 + 12;
+
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
use Cwd ();
my $cwd = Cwd::cwd();
@@ -38,8 +41,6 @@
#########################
-use_ok 'Module::Build';
-
my $mb = Module::Build->subclass(
code => q#
sub ACTION_testspecial {
Modified: Module-Build/trunk/t/tilde.t
==============================================================================
--- Module-Build/trunk/t/tilde.t (original)
+++ Module-Build/trunk/t/tilde.t Mon Jan 28 15:13:12 2008
@@ -4,7 +4,10 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 15;
+use MBTest tests => 17;
+
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
use Cwd ();
my $cwd = Cwd::cwd;
@@ -17,8 +20,6 @@
chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
-use Module::Build;
-
sub run_sample {
my @args = @_;
Modified: Module-Build/trunk/t/versions.t
==============================================================================
--- Module-Build/trunk/t/versions.t (original)
+++ Module-Build/trunk/t/versions.t Mon Jan 28 15:13:12 2008
@@ -2,7 +2,10 @@
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
-use MBTest tests => 2;
+use MBTest tests => 4;
+
+use_ok 'Module::Build';
+ensure_blib('Module::Build');
use Cwd ();
my $cwd = Cwd::cwd;
@@ -14,8 +17,6 @@
#########################
-use Module::Build;
-
my @mod = split( /::/, $dist->name );
my $file = File::Spec->catfile( $dist->dirname, 'lib', @mod ) . '.pm';
is( Module::Build->version_from_file( $file ), '0.01', 'version_from_file' );
Modified: Module-Build/trunk/t/xs.t
==============================================================================
--- Module-Build/trunk/t/xs.t (original)
+++ Module-Build/trunk/t/xs.t Mon Jan 28 15:13:12 2008
@@ -13,10 +13,13 @@
} elsif ( !$have_c_compiler ) {
plan skip_all => 'C_support enabled, but no compiler found';
} else {
- plan tests => 22;
+ plan tests => 23;
}
}
+ensure_blib('Module::Build');
+
+
#########################
