In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/983cf2d83de228bc3435cafbd5a0a6171f3eaa85?hp=a3738a1246b1e2ad3a979c133fd7b3ded7f54fb2>
- Log -----------------------------------------------------------------
commit 983cf2d83de228bc3435cafbd5a0a6171f3eaa85
Author: Chris Williams <ch...@bingosnet.co.uk>
Date: Wed Apr 14 11:44:41 2010 +0100
Changes to CPANPLUS and CPANPLUS::Dist::Build tests
Add the utils/ dir to $ENV{PATH} if running under PERL_CORE for the
CPANPLUS/CPANPLUS-Dist-Build tests.
Both modules' testsuites require access to the cpanp-run-perl script
and the version in utils/ is already executable versus the version
in cpan/CPANPLUS/bin
-----------------------------------------------------------------------
Summary of changes:
cpan/CPANPLUS-Dist-Build/t/inc/conf.pl | 5 ++---
cpan/CPANPLUS/t/inc/conf.pl | 8 +++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/cpan/CPANPLUS-Dist-Build/t/inc/conf.pl
b/cpan/CPANPLUS-Dist-Build/t/inc/conf.pl
index a104eb9..506b3ed 100644
--- a/cpan/CPANPLUS-Dist-Build/t/inc/conf.pl
+++ b/cpan/CPANPLUS-Dist-Build/t/inc/conf.pl
@@ -29,11 +29,10 @@ BEGIN {
### add CPANPLUS' bin dir to the front of $ENV{PATH}, so that
cpanp-run-perl
### and friends get picked up, only under PERL_CORE though.
+ $old_env_path = $ENV{PATH};
if ( $ENV{PERL_CORE} ) {
- $old_env_path = $ENV{PATH};
$ENV{'PATH'} = join $Config{'path_sep'},
- grep { defined } "$FindBin::Bin/../../CPANPLUS/bin",
$ENV{'PATH'};
-
+ grep { defined } "$FindBin::Bin/../../../utils",
$ENV{'PATH'};
}
### Fix up the path to perl, as we're about to chdir
diff --git a/cpan/CPANPLUS/t/inc/conf.pl b/cpan/CPANPLUS/t/inc/conf.pl
index 4f6c3d6..ca64731 100644
--- a/cpan/CPANPLUS/t/inc/conf.pl
+++ b/cpan/CPANPLUS/t/inc/conf.pl
@@ -30,8 +30,14 @@ BEGIN {
### add our own path to the front of $ENV{PATH}, so that cpanp-run-perl
### and friends get picked up
$old_env_path = $ENV{PATH};
- $ENV{'PATH'} = join $Config{'path_sep'},
+ if ( $ENV{PERL_CORE} ) {
+ $ENV{'PATH'} = join $Config{'path_sep'},
+ grep { defined } "$FindBin::Bin/../../../utils",
$ENV{'PATH'};
+ }
+ else {
+ $ENV{'PATH'} = join $Config{'path_sep'},
grep { defined } "$FindBin::Bin/../bin", $ENV{'PATH'};
+ }
### Fix up the path to perl, as we're about to chdir
### but only under perlcore, or if the path contains delimiters,
--
Perl5 Master Repository
