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

[stas]

stas        01/12/10 22:23:34

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
  Log:
  - use the existing configuration for configuration reports
  - add undef check before using a value in catfile
  
  Revision  Changes    Path
  1.95      +2 -1      
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.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- TestConfig.pm     2001/12/11 05:08:13     1.94
  +++ TestConfig.pm     2001/12/11 06:23:34     1.95
  @@ -274,6 +274,7 @@
           #sbindir should be bin/ with the default layout
           #but its eaiser to workaround apxs than fix apxs
           for my $dir (map { $vars->{$_} } qw(sbindir bindir)) {
  +            next unless defined $dir;
               my $httpd = catfile $dir, $vars->{target};
               next unless -x $httpd;
               $vars->{httpd} = $httpd;
  @@ -1197,7 +1198,7 @@
       my $command = '';
   
       # httpd opts
  -    my $test_config = Apache::TestConfig->new;
  +    my $test_config = Apache::TestConfig->new({thaw=>1});
       if (my $httpd = $test_config->{vars}->{httpd}) {
           $command = "$httpd -V";
           $cfg .= "\n*** $command\n";