stas 2003/01/22 20:06:38
Modified: . Changes perl-framework/Apache-Test/lib/Apache TestConfigParse.pm TestRunPerl.pm Log: - s/should_load_module/should_skip_module/ to be consistent with a new method and the skip_modules hash - add a new method config_parse_skip_module_add to extend the skip list, in the case of mod_perl is already configured from the build and we need to skip it when it's found in the system-wide httpd.conf Revision Changes Path 1.111 +3 -0 modperl-2.0/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- Changes 23 Jan 2003 00:31:28 -0000 1.110 +++ Changes 23 Jan 2003 04:06:38 -0000 1.111 @@ -10,6 +10,9 @@ =item 1.99_09-dev +Apache::Test: don't inherit loading of the mod_perl object from the +system-wide config, since we already add it [Stas] + All response functions are now returning status and the callers check and croak on failure or progate them further. [Stas] 1.28 +12 -3 httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm Index: TestConfigParse.pm =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- TestConfigParse.pm 11 Jan 2003 01:58:51 -0000 1.27 +++ TestConfigParse.pm 23 Jan 2003 04:06:38 -0000 1.28 @@ -88,9 +88,18 @@ #skip it for now, tomcat has its own test suite anyhow. my %skip_modules = map { $_, 1 } qw(mod_jk.c); -sub should_load_module { +# add modules to be not inherited from the existing config. +# e.g. prevent from LoadModule perl_module to be included twice, when +# mod_perl already configures LoadModule and it's certainly found in +# the existing httpd.conf installed system-wide. +sub config_parse_skip_module_add { my($self, $name) = @_; - return $skip_modules{$name} ? 0 : 1; + $skip_modules{$name} = 1; +} + +sub should_skip_module { + my($self, $name) = @_; + return $skip_modules{$name} ? 1 : 0; } #inherit LoadModule @@ -112,7 +121,7 @@ $name = $modname_alias{$name} if $modname_alias{$name}; - unless ($self->should_load_module($name)) { + unless ($self->should_skip_module($name)) { debug "Skipping LoadModule of $name"; next; } 1.9 +2 -0 httpd-test/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm Index: TestRunPerl.pm =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- TestRunPerl.pm 12 Dec 2002 10:10:19 -0000 1.8 +++ TestRunPerl.pm 23 Jan 2003 04:06:38 -0000 1.9 @@ -16,6 +16,8 @@ my $test_config = $self->{test_config}; + $test_config->config_parse_skip_module_add('mod_perl.c'); + $test_config->preamble_register(qw(configure_libmodperl)); $test_config->postamble_register(qw(configure_inc