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

[stas]

stas        02/03/26 09:38:54

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
                        TestRun.pm
  Log:
  create t/conf as early as possible to avoid problems with code that relies
  on this directory to exist
  
  Revision  Changes    Path
  1.124     +6 -3      
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.123
  retrieving revision 1.124
  diff -u -r1.123 -r1.124
  --- TestConfig.pm     23 Jan 2002 21:57:10 -0000      1.123
  +++ TestConfig.pm     26 Mar 2002 17:38:54 -0000      1.124
  @@ -1090,6 +1090,11 @@
       return "";
   }
   
  +sub prepare_t_conf {
  +    my $self = shift;
  +    $self->gendir($self->{vars}->{t_conf});
  +}
  +
   sub generate_httpd_conf {
       my $self = shift;
       my $vars = $self->{vars};
  @@ -1098,9 +1103,7 @@
       $self->generate_types_config;
       $self->generate_index_html;
   
  -    for (qw(t_logs t_conf)) {
  -        $self->gendir($self->{vars}->{$_});
  -    }
  +    $self->gendir($vars->{t_logs});
   
       if (my $extra_conf = $self->generate_extra_conf) {
           for my $file (@$extra_conf) {
  
  
  
  1.87      +3 -0      
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.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- TestRun.pm        7 Mar 2002 05:20:18 -0000       1.86
  +++ TestRun.pm        26 Mar 2002 17:38:54 -0000      1.87
  @@ -369,6 +369,9 @@
   sub configure {
       my $self = shift;
   
  +    # create the conf dir as early as possible
  +    $self->{test_config}->prepare_t_conf();
  +
       my $save = \$self->{conf_opts}->{save};
       $self->configure_opts($save);