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 Test.pm TestConfig.pm TestRun.pm
Date Mon, 09 Aug 2004 06:19:16 GMT
stas        2004/08/08 23:19:16

  Modified:    perl-framework/Apache-Test/lib/Apache Test.pm TestConfig.pm
                        TestRun.pm
  Log:
  another round of fixes of fixes
  
  Revision  Changes    Path
  1.96      +2 -2      httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm
  
  Index: Test.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -u -r1.95 -r1.96
  --- Test.pm	7 Aug 2004 02:56:26 -0000	1.95
  +++ Test.pm	9 Aug 2004 06:19:15 -0000	1.96
  @@ -54,12 +54,12 @@
   my $Config;
   
   sub config {
  -    $Config ||= Apache::TestConfig->thaw;
  +    $Config ||= Apache::TestConfig->thaw->httpd_config;
   }
   
   # doesn't require httpd to be found
   sub basic_config {
  -    $Config ||= Apache::TestConfig->thaw(no_httpd_config => 1);
  +    $Config ||= Apache::TestConfig->thaw();
   }
   
   sub vars {
  
  
  
  1.235     +2 -15     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.234
  retrieving revision 1.235
  diff -u -u -r1.234 -r1.235
  --- TestConfig.pm	7 Aug 2004 02:56:26 -0000	1.234
  +++ TestConfig.pm	9 Aug 2004 06:19:15 -0000	1.235
  @@ -187,22 +187,9 @@
       Apache::TestServer->new($args || $self)
   }
   
  -sub new {
  -    my $class = shift;
  -
  -    # httpd-independent components
  -    my $self = $class->new_common(@_);
  -
  -    my $vars = $self->{vars};
  -
  -    # components requiring httpd knowledge
  -    $self->httpd_config unless $vars->{no_httpd_config};
  -
  -    $self;
  -}
  -
   # setup httpd-independent components
  -sub new_common {
  +# for httpd-specific call $self->httpd_config()
  +sub new {
       my $class = shift;
   
       my $args;
  
  
  
  1.177     +2 -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.176
  retrieving revision 1.177
  diff -u -u -r1.176 -r1.177
  --- TestRun.pm	7 Aug 2004 02:56:26 -0000	1.176
  +++ TestRun.pm	9 Aug 2004 06:19:15 -0000	1.177
  @@ -684,8 +684,7 @@
       $self->pre_configure();
   
       # can't setup the httpd-specific parts of the config object yet
  -    $self->{test_config} =
  -        Apache::TestConfig->new_common($self->{conf_opts});
  +    $self->{test_config} = $self->new_test_config();
   
       $self->warn_core();
   
  @@ -697,7 +696,7 @@
       $self->try_exit_opts;
   
       # httpd is found here (unless it was already configured before)
  -    $self->{test_config}->httpd_config;
  +    $self->{test_config}->httpd_config();
   
       if ($self->{opts}->{configure}) {
           warning "cleaning out current configuration";
  
  
  

Mime
View raw message