stas 2004/03/09 12:46:13
Modified: t/hooks cleanup.t t/hooks/TestHooks cleanup.pm startup.pm Log: deploy the new wrapper Apache::Test::vars Revision Changes Path 1.4 +1 -3 modperl-2.0/t/hooks/cleanup.t Index: cleanup.t =================================================================== RCS file: /home/cvs/modperl-2.0/t/hooks/cleanup.t,v retrieving revision 1.3 retrieving revision 1.4 diff -u -u -r1.3 -r1.4 --- cleanup.t 6 Jun 2003 04:24:11 -0000 1.3 +++ cleanup.t 9 Mar 2004 20:46:13 -0000 1.4 @@ -10,9 +10,7 @@ use constant SIZE => 10; use constant TRIES => 20; -my $vars = Apache::Test::config->{vars}; -my $dir = catdir $vars->{documentroot}, "hooks"; -my $file = catfile $dir, "cleanup"; +my $file = catfile Apache::Test::vars("documentroot"), "hooks", "cleanup"; plan tests => 2; 1.5 +1 -1 modperl-2.0/t/hooks/TestHooks/cleanup.pm Index: cleanup.pm =================================================================== RCS file: /home/cvs/modperl-2.0/t/hooks/TestHooks/cleanup.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -u -r1.4 -r1.5 --- cleanup.pm 23 Dec 2003 00:34:36 -0000 1.4 +++ cleanup.pm 9 Mar 2004 20:46:13 -0000 1.5 @@ -17,7 +17,7 @@ use Apache::Const -compile => qw(OK DECLINED); sub get_file { - catfile Apache::Test::config->{vars}->{documentroot}, "hooks", "cleanup"; + catfile Apache::Test::vars("documentroot"), "hooks", "cleanup"; } sub handler { 1.3 +1 -2 modperl-2.0/t/hooks/TestHooks/startup.pm Index: startup.pm =================================================================== RCS file: /home/cvs/modperl-2.0/t/hooks/TestHooks/startup.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- startup.pm 5 Jan 2004 20:13:53 -0000 1.2 +++ startup.pm 9 Mar 2004 20:46:13 -0000 1.3 @@ -21,8 +21,7 @@ use Apache::Const -compile => 'OK'; -my $dir = catdir Apache::Test::config()->{vars}->{documentroot}, 'hooks', - 'startup'; +my $dir = catdir Apache::Test::vars("documentroot"), 'hooks', 'startup'; sub open_logs { my($conf_pool, $log_pool, $temp_pool, $s) = @_;