Author: stas Date: Thu Jan 13 06:19:22 2005 New Revision: 125077 URL: http://svn.apache.org/viewcvs?view=rev&rev=125077 Log: extend Apache::TestConfig::which() to search under perl's bin directory (in the case of local perl install many utils get installed there, but won't be in PATH).
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diff&rev=125077&p1=httpd/test/trunk/perl-framework/Apache-Test/Changes&r1=125076&p2=httpd/test/trunk/perl-framework/Apache-Test/Changes&r2=125077 ============================================================================== --- httpd/test/trunk/perl-framework/Apache-Test/Changes (original) +++ httpd/test/trunk/perl-framework/Apache-Test/Changes Thu Jan 13 06:19:22 2005 @@ -8,6 +8,10 @@ =item 1.20-dev +extend Apache::TestConfig::which() to search under perl's bin +directory (in the case of local perl install many utils get installed +there, but won't be in PATH). [Stas] + Apache::TestConfig::inherit_load_module handles .dll modules (previously was only .so) [Stas] Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm?view=diff&rev=125077&p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm&r1=125076&p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm&r2=125077 ============================================================================== --- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm (original) +++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Thu Jan 13 06:19:22 2005 @@ -1643,7 +1643,13 @@ return undef unless $program; - for my $base (map { catfile($_, $program) } File::Spec->path()) { + my @dirs = File::Spec->path(); + + require Config; + my $perl_bin = $Config::Config{bin} || ''; + push @dirs, $perl_bin if $perl_bin and -d $perl_bin; + + for my $base (map { catfile $_, $program } @dirs) { if ($ENV{HOME} and not WIN32) { # only works on Unix, but that's normal: # on Win32 the shell doesn't have special treatment of '~'
