stas 2002/12/03 07:28:52
Modified: . Changes
t/response/TestDirective perlrequire.pm perlmodule.pm
perl-framework/Apache-Test/lib/Apache TestConfigPerl.pm
Log:
- fix the Apache::TestConfigPerl's run_apache_test_config() function
where test packages are scanned for the magic APACHE_TEST_CONFIGURE
and if found get require()'d. Apache2 needs to be run for mod_perl
2.0.
- remove the 'use Apache2' in 2 tests which now don't need it
Revision Changes Path
1.73 +8 -3 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- Changes 2 Dec 2002 17:10:25 -0000 1.72
+++ Changes 3 Dec 2002 15:28:52 -0000 1.73
@@ -10,15 +10,20 @@
=item 1.99_08-dev
-Move the custom mod_perl 2.0 configuration bits out of the
+fix the Apache::TestConfigPerl's run_apache_test_config() function
+where test packages are scanned for the magic APACHE_TEST_CONFIGURE
+and if found get require()'d. Apache2 needs to be run for mod_perl
+2.0. [Stas Bekman]
+
+move the custom mod_perl 2.0 configuration bits out of the
ModPerl::TestRun, where they don't belong, into a special config file
which is included at the very end of httpd.conf [Stas Bekman]
-Extend Apache::Test to allow extra configuration files to be included
+extend Apache::Test to allow extra configuration files to be included
at the very end of httpd.conf, when everything was loaded and
configured [Stas Bekman]
-Resolve a segfault in Apache::Module::get_config() for the edge case
+resolve a segfault in Apache::Module::get_config() for the edge case
when the package name is bogus. [Stas Bekman]
Apache::Reload: add support for watching and reloading modules only in
1.9 +0 -2 modperl-2.0/t/response/TestDirective/perlrequire.pm
Index: perlrequire.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlrequire.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perlrequire.pm 30 May 2002 23:57:50 -0000 1.8
+++ perlrequire.pm 3 Dec 2002 15:28:52 -0000 1.9
@@ -9,8 +9,6 @@
use strict;
use warnings FATAL => 'all';
-use Apache2 ();
-
use Apache::Test ();
use Apache::RequestRec ();
1.6 +0 -2 modperl-2.0/t/response/TestDirective/perlmodule.pm
Index: perlmodule.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlmodule.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perlmodule.pm 30 May 2002 23:57:50 -0000 1.5
+++ perlmodule.pm 3 Dec 2002 15:28:52 -0000 1.6
@@ -7,8 +7,6 @@
use strict;
use warnings FATAL => 'all';
-use Apache2 ();
-
use Apache::Test ();
use Apache::RequestRec ();
1.54 +7 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm
Index: TestConfigPerl.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- TestConfigPerl.pm 1 Jul 2002 07:57:15 -0000 1.53
+++ TestConfigPerl.pm 3 Dec 2002 15:28:52 -0000 1.54
@@ -282,6 +282,13 @@
sub configure_pm_tests {
my $self = shift;
+ # since server wasn't started yet, the modules in blib under
+ # Apache2 can't be seen. So we must load Apache2.pm, without which
+ # run_apache_test_config might fail to require modules
+ if ($mod_perl::VERSION > 1.99) {
+ require Apache2;
+ }
+
for my $subdir (qw(Response Protocol Hooks Filter)) {
my $dir = catfile $self->{vars}->{t_dir}, lc $subdir;
next unless -d $dir;
