diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2007-05-08 22:19:21 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2007-05-08 22:19:21 +0000 |
| commit | 53873a16992a7115bd6070904cd9bc6ca0c49749 (patch) | |
| tree | 2073e51695f065bfa6c748b552790ba75f318a73 /lib/CPANPLUS | |
| parent | c039cd6f5b504f5261909679470822bc57c2e3d5 (diff) | |
| download | perl-53873a16992a7115bd6070904cd9bc6ca0c49749.tar.gz | |
Reapply patch 31028, that wasn't integrated in CPANPLUS
p4raw-id: //depot/perl@31173
Diffstat (limited to 'lib/CPANPLUS')
| -rw-r--r-- | lib/CPANPLUS/t/inc/conf.pl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/CPANPLUS/t/inc/conf.pl b/lib/CPANPLUS/t/inc/conf.pl index 50c897049e..0694a79bcc 100644 --- a/lib/CPANPLUS/t/inc/conf.pl +++ b/lib/CPANPLUS/t/inc/conf.pl @@ -120,7 +120,7 @@ sub gimme_conf { # TEST_INSTALL_DIR_BIN, # TEST_INSTALL_DIR_MAN1, # TEST_INSTALL_DIR_MAN3, - ], 1 ); + ], ( $ENV{PERL_CORE} ? 0 : 1 ) ); return $conf; }; @@ -154,7 +154,7 @@ END { # TEST_INSTALL_DIR_BIN, # TEST_INSTALL_DIR_MAN1, # TEST_INSTALL_DIR_MAN3, - ], 1 ); + ], 0 ); # DO NOT be verbose under perl core -- makes tests fail } } @@ -168,6 +168,9 @@ sub _clean_test_dir { for my $dir ( @$dirs ) { + ### no point if it doesn't exist; + next unless -d $dir; + my $dh; opendir $dh, $dir or die "Could not open basedir '$dir': $!"; while( my $file = readdir $dh ) { @@ -177,7 +180,7 @@ sub _clean_test_dir { ### directory, rmtree it if( -d $path ) { - print "Deleting directory '$path'\n" if $verbose; + print "# Deleting directory '$path'\n" if $verbose; eval { rmtree( $path ) }; warn "Could not delete '$path' while cleaning up '$dir'" if $@; |