stas 2003/04/22 01:11:23
Modified: perl-framework/Apache-Test/lib/Apache TestRunPerl.pm
perl-framework/Apache-Test Changes
Log:
skip the mod_perl.so pickup from the system-wide file only for mod_perl
2.0's 'make test'
Revision Changes Path
1.11 +5 -2
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestRunPerl.pm 26 Jan 2003 03:14:04 -0000 1.10
+++ TestRunPerl.pm 22 Apr 2003 08:11:23 -0000 1.11
@@ -14,8 +14,11 @@
sub pre_configure {
my $self = shift;
- Apache::TestConfig::config_parse_skip_module_add('mod_perl.c');
-
+ # don't pick up 'LoadModule ... mod_perl.so' from the global
+ # httpd.conf, when using the locally built .so in the tests
+ if (Apache::TestConfig::IS_MOD_PERL_2_BUILD()) {
+ Apache::TestConfig::config_parse_skip_module_add('mod_perl.c');
+ }
}
sub configure_modperl {
1.4 +2 -2 httpd-test/perl-framework/Apache-Test/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Changes 22 Apr 2003 00:49:45 -0000 1.3
+++ Changes 22 Apr 2003 08:11:23 -0000 1.4
@@ -40,8 +40,8 @@
files under t/ to the user chosen to run the server with, before
running the tests and will restore the permissions at the end. [Stas]
-Don't inherit loading of the mod_perl object from the system-wide
-config, since we already add it [Stas]
+for mod_perl 2.0 'make test', don't inherit loading of the mod_perl
+object from the system-wide config, since we already add it [Stas]
Support two new shortcuts for skip functionality:
- have_threads: checks whether both Apache and Perl support threads
