httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
Date Thu, 08 Jan 2004 06:10:20 GMT
stas        2004/01/07 22:10:20

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
  Log:
  restore the part in configure_httpd which figures out the path to httpd
  from the mod_perl config (for mod_perl 2.0 via Apache::Build). we need it
  so that modperl-2.0 test suite won't start interactive config session
  
  Revision  Changes    Path
  1.196     +14 -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.195
  retrieving revision 1.196
  diff -u -u -r1.195 -r1.196
  --- TestConfig.pm	8 Jan 2004 04:49:22 -0000	1.195
  +++ TestConfig.pm	8 Jan 2004 06:10:20 -0000	1.196
  @@ -308,6 +308,20 @@
   
       $vars->{target} ||= (WIN32 ? 'Apache.exe' : 'httpd');
   
  +    unless ($vars->{httpd}) {
  +        #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;
  +            last;
  +        }
  +
  +        $vars->{httpd} ||= $self->default_httpd;
  +    }
  +
       if ($vars->{httpd}) {
           my @chunks = splitdir $vars->{httpd};
           #handle both $prefix/bin/httpd and $prefix/Apache.exe
  
  
  

Mime
View raw message