You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by do...@apache.org on 2002/05/13 20:49:20 UTC
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestConfigParse.pm TestConfigPerl.pm TestRun.pm TestRunPerl.pm
dougm 02/05/13 11:49:20
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
TestConfigParse.pm TestConfigPerl.pm TestRun.pm
TestRunPerl.pm
Log:
fix so inherit_config is run later (during configure rather than new),
making it easier to change behavior of inherit_config.
make sure LoadModule of mod_perl.so is not inherited if one is found
in the source tree (i.e. the mod_perl 'make test')
Revision Changes Path
1.129 +0 -2 httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- TestConfig.pm 6 Apr 2002 02:39:31 -0000 1.128
+++ TestConfig.pm 13 May 2002 18:49:19 -0000 1.129
@@ -223,8 +223,6 @@
$self->configure_apxs;
$self->configure_httpd;
- $self->inherit_config; #see TestConfigParse.pm
- $self->configure_httpd_eapi; #must come after inherit_config
$self->default_module(cgi => [qw(mod_cgi mod_cgid)]);
$self->default_module(thread => [qw(worker threaded)]);
1.23 +1 -0 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TestConfigParse.pm 7 Apr 2002 04:18:02 -0000 1.22
+++ TestConfigParse.pm 13 May 2002 18:49:20 -0000 1.23
@@ -100,6 +100,7 @@
my $name = basename $args->[1];
$name =~ s/\.s[ol]$/.c/; #mod_info.so => mod_info.c
$name =~ s/^lib/mod_/; #libphp4.so => mod_php4.c
+ next if $self->{modules}->{$name}; #already loaded
debug "LoadModule $modname $name";
$name = $modname_alias{$name} if $modname_alias{$name};
$self->{modules}->{$name} = 1;
1.50 +1 -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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- TestConfigPerl.pm 12 May 2002 18:27:35 -0000 1.49
+++ TestConfigPerl.pm 13 May 2002 18:49:20 -0000 1.50
@@ -30,6 +30,7 @@
my $cfg = '';
if (-e $vars->{libmodperl}) {
+ $self->{modules}->{'mod_perl.c'} = 1;
if (Apache::TestConfig::WIN32) {
my $lib = "$Config{installbin}\\$Config{libperl}";
$lib =~ s/lib$/dll/;
1.88 +2 -0 httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Index: TestRun.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- TestRun.pm 26 Mar 2002 17:38:54 -0000 1.87
+++ TestRun.pm 13 May 2002 18:49:20 -0000 1.88
@@ -392,6 +392,8 @@
}
my $test_config = $self->{test_config};
+ $test_config->inherit_config; #see TestConfigParse.pm
+ $test_config->configure_httpd_eapi; #must come after inherit_config
$test_config->sslca_generate;
$test_config->generate_ssl_conf if $self->{opts}->{ssl};
$test_config->cmodules_configure;
1.5 +1 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestRunPerl.pm 31 Dec 2001 08:39:48 -0000 1.4
+++ TestRunPerl.pm 13 May 2002 18:49:20 -0000 1.5
@@ -16,7 +16,7 @@
my $test_config = $self->{test_config};
- $test_config->preamble_register(qw(configure_libmodperl));
+ $test_config->configure_libmodperl;
$test_config->postamble_register(qw(configure_inc
configure_pm_tests