stas 2004/04/01 17:55:59
Modified: t/conf modperl_extra.pl
Log:
style/api tweaks, no functionality change
Revision Changes Path
1.42 +5 -5 modperl-2.0/t/conf/modperl_extra.pl
Index: modperl_extra.pl
===================================================================
RCS file: /home/cvs/modperl-2.0/t/conf/modperl_extra.pl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -u -r1.41 -r1.42
--- modperl_extra.pl 2 Feb 2004 18:33:27 -0000 1.41
+++ modperl_extra.pl 2 Apr 2004 01:55:59 -0000 1.42
@@ -12,7 +12,8 @@
# reorg @INC to have first devel libs, then blib libs, and only then
# perl core libs
my $pool = Apache->server->process->pool;
-my $project_root = canonpath Apache::Server::server_root_relative($pool, "..");
+my $project_root = canonpath
+ Apache::Server::server_root_relative($pool, "..");
my (@a, @b, @c);
for (@INC) {
if (m|^\Q$project_root\E|) {
@@ -49,8 +50,8 @@
#see t/response/TestModperl/env.pm
$ENV{MODPERL_EXTRA_PL} = __FILE__;
-my $ap_mods = scalar grep { /^Apache/ } keys %INC;
-my $apr_mods = scalar grep { /^APR/ } keys %INC;
+my $ap_mods = scalar grep { /^Apache/ } keys %INC;
+my $apr_mods = scalar grep { /^APR/ } keys %INC;
Apache::Log->info("$ap_mods Apache:: modules loaded");
Apache::Server->log->info("$apr_mods APR:: modules loaded");
@@ -84,8 +85,7 @@
# the test needing these files may run more than once (t/SMOKE)
{
require Apache::Test;
- my $dir = catdir Apache::Test::config()->{vars}->{documentroot}, 'hooks',
- 'startup';
+ my $dir = catdir Apache::Test::vars('documentroot'), qw(hooks startup);
for (<$dir/*>) {
my $file = ($_ =~ /(.*(?:open_logs|post_config)-\d+)/);
unlink $file;
