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

[stas]

stas        2004/01/07 20:53:00

  Modified:    perl-framework/Apache-Test/lib/Apache TestRun.pm
  Log:
  custom config overriding can't be part of new_test_config since it gets 
overriden
  in t/TEST, so move it into a separate sub custom_config_add_conf_opts, called 
from
  run()
  
  Revision  Changes    Path
  1.133     +12 -5     
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.132
  retrieving revision 1.133
  diff -u -u -r1.132 -r1.133
  --- TestRun.pm        7 Jan 2004 17:51:21 -0000       1.132
  +++ TestRun.pm        8 Jan 2004 04:53:00 -0000       1.133
  @@ -583,10 +583,7 @@
   
   sub new_test_config {
       my $self = shift;
  -    for (@data_vars_must, @data_vars_opt) {
  -        next unless $Apache::TestConfigData::vars->{$_};
  -        $self->{conf_opts}->{$_} ||= $Apache::TestConfigData::vars->{$_};
  -    }
  +
       Apache::TestConfig->new($self->{conf_opts});
   }
   
  @@ -646,7 +643,8 @@
   
       $self->pre_configure() if $self->can('pre_configure');
   
  -    $self->{test_config} = $self->new_test_config;
  +    $self->custom_config_add_conf_opts();
  +    $self->{test_config} = $self->new_test_config();
   
       # make it easy to move the whole distro
       $self->refresh unless -e $self->{test_config}->{vars}->{top_dir};
  @@ -1133,6 +1131,15 @@
   #    require Carp;
   #    Carp::cluck('exiting');
       CORE::exit $_[0];
  +}
  +
  +sub custom_config_add_conf_opts {
  +    my $self = shift;
  +
  +    for (@data_vars_must, @data_vars_opt) {
  +        next unless $Apache::TestConfigData::vars->{$_};
  +        $self->{conf_opts}->{$_} ||= $Apache::TestConfigData::vars->{$_};
  +    }
   }
   
   # determine where the configuration file Apache/TestConfigData.pm