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

[stas]

stas        2004/02/19 11:52:52

  Modified:    perl-framework/Apache-Test/lib/Apache TestRun.pm
  Log:
  if we are already reconfigure, don't run extra checks whether we need to
  reconfigure
  
  Revision  Changes    Path
  1.152     +6 -3      
httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
  
  Index: TestRun.pm
  ===================================================================
  RCS file: 
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
  retrieving revision 1.151
  retrieving revision 1.152
  diff -u -u -r1.151 -r1.152
  --- TestRun.pm        19 Feb 2004 06:41:36 -0000      1.151
  +++ TestRun.pm        19 Feb 2004 19:52:52 -0000      1.152
  @@ -391,8 +391,10 @@
           $ENV{APACHE_TEST_HTTP11} = 1;
       }
   
  -    if (my @reasons = 
  -        $self->{test_config}->need_reconfiguration($self->{conf_opts})) {
  +    # unless we are already reconfiguring, check for .conf.in files changes
  +    if (!$$save &&
  +        (my @reasons =
  +         $self->{test_config}->need_reconfiguration($self->{conf_opts}))) {
           warning "forcing re-configuration:";
           warning "\t- $_." for @reasons;
           unless ($refreshed) {
  @@ -402,7 +404,8 @@
           }
       }
   
  -    if (exists $opts->{proxy}) {
  +    # unless we are already reconfiguring, check for -proxy
  +    if (!$$save && exists $opts->{proxy}) {
           my $max = $test_config->{vars}->{maxclients};
           $opts->{proxy} ||= 'on';