cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestConfigPerl.pm

[stas]

stas        2003/10/21 15:09:41

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
                        TestConfigPerl.pm
  Log:
  extra protection
  
  Revision  Changes    Path
  1.181     +2 -0      
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.180
  retrieving revision 1.181
  diff -u -u -r1.180 -r1.181
  --- TestConfig.pm     21 Oct 2003 22:09:11 -0000      1.180
  +++ TestConfig.pm     21 Oct 2003 22:09:41 -0000      1.181
  @@ -631,6 +631,8 @@
   sub find_apache_module {
       my($self, $module) = @_;
   
  +    die "find_apache_module: module name argument is required" unless 
$module;
  +
       my $vars = $self->{vars};
       my $sroot = $vars->{serverroot};
   
  
  
  
  1.79      +4 -3      
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.78
  retrieving revision 1.79
  diff -u -u -r1.78 -r1.79
  --- TestConfigPerl.pm 20 Oct 2003 20:22:56 -0000      1.78
  +++ TestConfigPerl.pm 21 Oct 2003 22:09:41 -0000      1.79
  @@ -31,8 +31,10 @@
       # the wanted version is 1. So check that we use mod_perl 2
       elsif ($server->{rev} >= 2 && IS_MOD_PERL_2) {
           if (my $build_config = $self->modperl_build_config()) {
  -            $libname = $build_config->{MODPERL_LIB_SHARED};
  -            $vars->{libmodperl} ||= $self->find_apache_module($libname);
  +            if ($build_config->{MODPERL_LIB_SHARED}) {
  +                $libname = $build_config->{MODPERL_LIB_SHARED};
  +                $vars->{libmodperl} ||= $self->find_apache_module($libname);
  +            }
               # XXX: we have a problem with several perl trees pointing
               # to the same httpd tree. So it's possible that we
               # configure the test suite to run with mod_perl.so built
  @@ -153,7 +155,6 @@
       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
           for (reverse @$inc) {
               print $fh "use lib '$_';\n";
           }