joes 2003/07/20 12:46:33
Modified: glue/perl/t TEST.PL
Log:
Revert configure_startup_pl override- Apache::Test DTRT now that we've
replaced ExtUtils::MakeMaker with ModPerl::MM
Revision Changes Path
1.5 +1 -40 httpd-apreq-2/glue/perl/t/TEST.PL
Index: TEST.PL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/t/TEST.PL,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TEST.PL 20 Jul 2003 08:52:19 -0000 1.4
+++ TEST.PL 20 Jul 2003 19:46:33 -0000 1.5
@@ -28,49 +28,10 @@
Apache::TestConfig::autoconfig_skip_module_add('mod_apreq.c');
}
-
sub configure_modperl {
my $self = shift;
- bless my $cfg = $self->{test_config}, "My::TestConfig";
+ my $cfg = $self->{test_config};
$cfg->preamble(IfModule => '!mod_apreq.c',
qq(LoadModule apreq_module "$env_dir_libs/mod_apreq.so"\n));
$self->SUPER::configure_modperl();
}
-
-
-package My::TestConfig;
-use base 'Apache::TestConfig';
-use File::Spec::Functions qw(catfile);
-sub configure_startup_pl {
- my $self = shift;
-
- #for 2.0 we could just use PerlSwitches -Mlib=...
- #but this will work for both 2.0 and 1.xx
- if (my $inc = $self->{inc}) {
- my $include_pl = catfile $self->{vars}->{t_conf}, 'modperl_inc.pl';
- my $fh = $self->genfile($include_pl);
- # make sure that the dev libs come before blib
- my $fixup = Apache::TestConfig->modperl_2_inc_fixup();
- print $fh $fixup;
- for (reverse @$inc) {
- print $fh "use lib '$_';\n";
- }
- print $fh "1;\n";
- }
-
- if ($self->server->{rev} >= 2) {
- $self->postamble(PerlSwitches =>
"-Mlib=$self->{vars}->{serverroot}");
- }
-
- my $startup_pl = catfile $self->{vars}->{t_conf}, 'modperl_startup.pl';
-
-
- unless (-e $startup_pl) {
- my $fh = $self->genfile($startup_pl);
- print $fh $self->startup_pl_code;
- close $fh;
- }
-
- $self->postamble(PerlRequire => $startup_pl);
-}
-
