Author: BINGOS
Date: Fri May 29 14:39:56 2009
New Revision: 12795
Modified:
CPANPLUS-Dist-Build/tags/0.28/Changes
CPANPLUS-Dist-Build/tags/0.28/lib/CPANPLUS/Dist/Build.pm
CPANPLUS-Dist-Build/tags/0.28/lib/CPANPLUS/Dist/Build/Constants.pm
CPANPLUS-Dist-Build/tags/0.28/t/02_CPANPLUS-Dist-Build.t
CPANPLUS-Dist-Build/tags/0.28/t/inc/conf.pl
Log:
Merge commit 'trunk'
Modified: CPANPLUS-Dist-Build/tags/0.28/Changes
==============================================================================
--- CPANPLUS-Dist-Build/tags/0.28/Changes (original)
+++ CPANPLUS-Dist-Build/tags/0.28/Changes Fri May 29 14:39:56 2009
@@ -1,5 +1,12 @@
Revision history for Perl extension CPANPLUS::Dist::Build.
+0.32
+ - Removed generation of .output files
+
+0.30 Mon May 18 16:23:14 BST 2009
+ - [RT #46176] Skip XS tests when perl compiled without dynamic
+ loading. Reported by Andy Dougherty
+
0.28 Fri May 8 10:58:42 BST 2009
- Add the CPANPLUS bin/ dir to $ENV{PATH} if we are running
under PERL_CORE. This fixes warnings during 'make test' in
Modified: CPANPLUS-Dist-Build/tags/0.28/lib/CPANPLUS/Dist/Build.pm
==============================================================================
--- CPANPLUS-Dist-Build/tags/0.28/lib/CPANPLUS/Dist/Build.pm (original)
+++ CPANPLUS-Dist-Build/tags/0.28/lib/CPANPLUS/Dist/Build.pm Fri May 29
14:39:56 2009
@@ -30,7 +30,7 @@
local $Params::Check::VERBOSE = 1;
-$VERSION = '0.28';
+$VERSION = '0.30';
=pod
Modified: CPANPLUS-Dist-Build/tags/0.28/lib/CPANPLUS/Dist/Build/Constants.pm
==============================================================================
--- CPANPLUS-Dist-Build/tags/0.28/lib/CPANPLUS/Dist/Build/Constants.pm
(original)
+++ CPANPLUS-Dist-Build/tags/0.28/lib/CPANPLUS/Dist/Build/Constants.pm Fri May
29 14:39:56 2009
@@ -9,7 +9,7 @@
require Exporter;
use vars qw[$VERSION @ISA @EXPORT];
- $VERSION = '0.28';
+ $VERSION = '0.30';
@ISA = qw[Exporter];
@EXPORT = qw[ BUILD_DIR BUILD ];
}
Modified: CPANPLUS-Dist-Build/tags/0.28/t/02_CPANPLUS-Dist-Build.t
==============================================================================
--- CPANPLUS-Dist-Build/tags/0.28/t/02_CPANPLUS-Dist-Build.t (original)
+++ CPANPLUS-Dist-Build/tags/0.28/t/02_CPANPLUS-Dist-Build.t Fri May 29
14:39:56 2009
@@ -15,7 +15,6 @@
use Test::More 'no_plan';
use File::Basename qw[basename];
use Data::Dumper;
-use Config;
use IPC::Cmd 'can_run';
$SIG{__WARN__} = sub {warn @_ unless @_ && $_[0] =~ /redefined|isn't numeric/};
@@ -28,6 +27,7 @@
my $Class = 'CPANPLUS::Dist::Build';
my $Utils = 'CPANPLUS::Internals::Utils';
my $Have_CC = can_run($Config{'cc'} )? 1 : 0;
+my $Usedl = $Config{usedl} ? 1 : 0;
my $Lib = File::Spec->rel2abs(File::Spec->catdir( qw[dummy-perl] ));
@@ -128,6 +128,8 @@
### we might not have a C compiler
SKIP: {
+ skip("Perl wasn't built with support for dynamic loading " .
+ "-- skipping compile tests", 5) unless $Usedl;
skip("The CC compiler listed in Config.pm is not available " .
"-- skipping compile tests", 5) if $need_cc && !$Have_CC;
skip("Module::Build is not compiled with C support ".
Modified: CPANPLUS-Dist-Build/tags/0.28/t/inc/conf.pl
==============================================================================
--- CPANPLUS-Dist-Build/tags/0.28/t/inc/conf.pl (original)
+++ CPANPLUS-Dist-Build/tags/0.28/t/inc/conf.pl Fri May 29 14:39:56 2009
@@ -202,45 +202,11 @@
return $conf;
};
-{
- my $fh;
- my $file = ".".basename($0).".output";
- sub output_handle {
- return $fh if $fh;
-
- $fh = FileHandle->new(">$file")
- or warn "Could not open output file '$file': $!";
-
- $fh->autoflush(1);
- return $fh;
- }
-
- sub output_file { return $file }
-
-
-
- ### redirect output from msg() and error() output to file
- unless( $ENV{$Env} ) {
-
- print "# To run tests in verbose mode, set ".
- "\$ENV{$Env} = 1\n" unless $ENV{PERL_CORE};
-
- 1 while unlink $file; # just in case
-
- $CPANPLUS::Error::ERROR_FH =
- $CPANPLUS::Error::ERROR_FH = output_handle();
-
- $CPANPLUS::Error::MSG_FH =
- $CPANPLUS::Error::MSG_FH = output_handle();
-
- }
-}
-
+# placeholder
### clean these files if we're under perl core
END {
if ( $ENV{PERL_CORE} ) {
- close output_handle(); 1 while unlink output_file();
_clean_test_dir( [
gimme_conf->get_conf('base'),
