httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
Date Tue, 13 Nov 2001 02:11:14 GMT
dougm       01/11/12 18:11:14

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
  Log:
  prefer apxs over httpd for reconfiguration check.
  
  Revision  Changes    Path
  1.81      +5 -4      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.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- TestConfig.pm	2001/11/13 01:05:50	1.80
  +++ TestConfig.pm	2001/11/13 02:11:14	1.81
  @@ -937,12 +937,13 @@
       my @reasons = ();
       my $vars = $self->{vars};
   
  -    # if httpd.conf is older than httpd executable
  +    my $exe = $vars->{apxs} || $vars->{httpd};
  +    # if httpd.conf is older than executable
       push @reasons, 
  -        "$vars->{httpd} is newer than $vars->{t_conf_file}"
  -            if -e $vars->{httpd} && 
  +        "$exe is newer than $vars->{t_conf_file}"
  +            if -e $exe && 
                  -e $vars->{t_conf_file} &&
  -               -M $vars->{httpd} < -M $vars->{t_conf_file};
  +               -M $exe < -M $vars->{t_conf_file};
   
       # if .in files are newer than their derived versions
       if (my $extra_conf = $self->generate_extra_conf) {
  
  
  

Mime
View raw message