Author: kwilliams
Date: Mon Jan 21 09:00:45 2008
New Revision: 10626
Modified:
Module-Build/branches/perl-5.10/lib/Module/Build/YAML.pm
Module-Build/branches/perl-5.10/t/destinations.t
Module-Build/branches/perl-5.10/t/install.t
Module-Build/branches/perl-5.10/t/lib/MBTest.pm
Module-Build/branches/perl-5.10/t/manifypods.t
Module-Build/branches/perl-5.10/t/ppm.t
Module-Build/branches/perl-5.10/t/test_type.t
Module-Build/branches/perl-5.10/t/tilde.t
Module-Build/branches/perl-5.10/t/xs.t
Log:
Changes that appeared in perl 5.10 but didn't make it to svn
Modified: Module-Build/branches/perl-5.10/lib/Module/Build/YAML.pm
==============================================================================
--- Module-Build/branches/perl-5.10/lib/Module/Build/YAML.pm (original)
+++ Module-Build/branches/perl-5.10/lib/Module/Build/YAML.pm Mon Jan 21
09:00:45 2008
@@ -1,9 +1,6 @@
package Module::Build::YAML;
use strict;
-use vars qw($VERSION);
-$VERSION = '0.2808_01';
-$VERSION = eval $VERSION;
use vars qw($VERSION @EXPORT @EXPORT_OK);
$VERSION = "0.50";
Modified: Module-Build/branches/perl-5.10/t/destinations.t
==============================================================================
--- Module-Build/branches/perl-5.10/t/destinations.t (original)
+++ Module-Build/branches/perl-5.10/t/destinations.t Mon Jan 21 09:00:45 2008
@@ -16,7 +16,7 @@
use Config;
-use File::Spec::Functions qw( catdir splitdir );
+use File::Spec::Functions qw( catdir splitdir splitpath );
#########################
@@ -300,10 +300,12 @@
my ($dir1, $dir2, $message) = @_;
$dir1 =~ s{/$}{} if $^O eq 'cygwin'; # remove any trailing slash
- my @dir1 = splitdir $dir1;
+ my (undef, $dirs1, undef) = splitpath $dir1;
+ my @dir1 = splitdir $dirs1;
$dir2 =~ s{/$}{} if $^O eq 'cygwin'; # remove any trailing slash
- my @dir2 = splitdir $dir2;
+ my (undef, $dirs2, undef) = splitpath $dir2;
+ my @dir2 = splitdir $dirs2;
is $dir1[-1], $dir2[-1], $message;
}
Modified: Module-Build/branches/perl-5.10/t/install.t
==============================================================================
--- Module-Build/branches/perl-5.10/t/install.t (original)
+++ Module-Build/branches/perl-5.10/t/install.t Mon Jan 21 09:00:45 2008
@@ -56,7 +56,7 @@
ok $mb;
-my $destdir = File::Spec->catdir($cwd, 't', 'install_test.' . $$);
+my $destdir = File::Spec->catdir($cwd, 't', 'install_test' . $$);
$mb->add_to_cleanup($destdir);
{
Modified: Module-Build/branches/perl-5.10/t/lib/MBTest.pm
==============================================================================
--- Module-Build/branches/perl-5.10/t/lib/MBTest.pm (original)
+++ Module-Build/branches/perl-5.10/t/lib/MBTest.pm Mon Jan 21 09:00:45 2008
@@ -62,7 +62,7 @@
{ # Setup a temp directory if it doesn't exist
my $cwd = Cwd::cwd;
- my $tmp = File::Spec->catdir( $cwd, 't', '_tmp.' . $$);
+ my $tmp = File::Spec->catdir( $cwd, 't', '_tmp' . $$);
mkdir $tmp, 0777 unless -d $tmp;
sub tmpdir { $tmp }
Modified: Module-Build/branches/perl-5.10/t/manifypods.t
==============================================================================
--- Module-Build/branches/perl-5.10/t/manifypods.t (original)
+++ Module-Build/branches/perl-5.10/t/manifypods.t Mon Jan 21 09:00:45 2008
@@ -58,7 +58,7 @@
chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
use File::Spec::Functions qw( catdir );
-my $destdir = catdir($cwd, 't', 'install_test.' . $$);
+my $destdir = catdir($cwd, 't', 'install_test' . $$);
my $mb = Module::Build->new(
@@ -118,7 +118,7 @@
next;
}
- my $to = File::Spec->catfile('blib', ($from =~ /^lib/ ? 'libdoc' :
'bindoc'), $v);
+ my $to = File::Spec->catfile('blib', ($from =~ /^[\.\/\[]*lib/ ? 'libdoc' :
'bindoc'), $v);
ok $mb->contains_pod($from), "$from should contain POD";
ok -e $to, "Created $to manpage";
}
Modified: Module-Build/branches/perl-5.10/t/ppm.t
==============================================================================
--- Module-Build/branches/perl-5.10/t/ppm.t (original)
+++ Module-Build/branches/perl-5.10/t/ppm.t Mon Jan 21 09:00:45 2008
@@ -20,6 +20,8 @@
plan skip_all => "Archive::Tar not installed to read archives.";
} elsif ( ! eval {IO::Zlib->VERSION(1.01)} ) {
plan skip_all => "IO::Zlib 1.01 required to read compressed archives.";
+ } elsif ( $^O eq 'VMS' ) {
+ plan skip_all => "Needs porting work on VMS";
} else {
plan tests => 12;
}
Modified: Module-Build/branches/perl-5.10/t/test_type.t
==============================================================================
--- Module-Build/branches/perl-5.10/t/test_type.t (original)
+++ Module-Build/branches/perl-5.10/t/test_type.t Mon Jan 21 09:00:45 2008
@@ -1,5 +1,12 @@
#!/usr/bin/perl -w
+BEGIN {
+ if ($^O eq 'VMS') {
+ print '1..0 # Child test output confuses harness';
+ exit;
+ }
+}
+
use strict;
use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
use MBTest tests => 8;
Modified: Module-Build/branches/perl-5.10/t/tilde.t
==============================================================================
--- Module-Build/branches/perl-5.10/t/tilde.t (original)
+++ Module-Build/branches/perl-5.10/t/tilde.t Mon Jan 21 09:00:45 2008
@@ -39,6 +39,7 @@
SKIP: {
my $home = $ENV{HOME} ? $ENV{HOME} : undef;
+ skip "Needs case and syntax tweaks for VMS", 14 if $^O eq 'VMS';
unless (defined $home) {
my @info = eval { getpwuid $> };
skip "No home directory for tilde-expansion tests", 14 if $@;
@@ -82,6 +83,7 @@
# Again, with named users
SKIP: {
+ skip "Needs case and syntax tweaks for VMS", 1 if $^O eq 'VMS';
my @info = eval { getpwuid $> };
skip "No home directory for tilde-expansion tests", 1 if $@;
my ($me, $home) = @info[0,7];
Modified: Module-Build/branches/perl-5.10/t/xs.t
==============================================================================
--- Module-Build/branches/perl-5.10/t/xs.t (original)
+++ Module-Build/branches/perl-5.10/t/xs.t Mon Jan 21 09:00:45 2008
@@ -12,6 +12,8 @@
plan skip_all => 'C_support not enabled';
} elsif ( !$have_c_compiler ) {
plan skip_all => 'C_support enabled, but no compiler found';
+ } elsif ( $^O eq 'VMS' ) {
+ plan skip_all => 'Child test output confuses harness';
} else {
plan tests => 22;
}
@@ -109,7 +111,7 @@
# Try a XS distro with a deep namespace
-$dist = DistGen->new( name => 'Simple::With::Deep::Namespace',
+$dist = DistGen->new( name => 'Simple::With::Deep::Name',
dir => $tmp, xs => 1 );
$dist->regen;
chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
