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 TestConfigParse.pm TestRun.pm TestRunPerl.pm
Date Sun, 26 Jan 2003 03:14:05 GMT
stas        2003/01/25 19:14:04

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfigParse.pm
                        TestRun.pm TestRunPerl.pm
  Log:
  add a new method pre_configure() to be run by the customized test suite,
  before the configuration object is created. This allows us to adjust
  default settings. In this particular case, when we run mod_perl we want to
  skip mod_perl from being picked from the system-wide httpd.conf, because
  it's already configured by Apache::TestConfigPerl
  
  Revision  Changes    Path
  1.30      +1 -1      httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
  
  Index: TestConfigParse.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- TestConfigParse.pm	26 Jan 2003 02:54:03 -0000	1.29
  +++ TestConfigParse.pm	26 Jan 2003 03:14:04 -0000	1.30
  @@ -93,7 +93,7 @@
   # mod_perl already configures LoadModule and it's certainly found in
   # the existing httpd.conf installed system-wide.
   sub config_parse_skip_module_add {
  -    my($self, $name) = @_;
  +    my($name) = @_;
       $skip_modules{$name} = 1;
   }
   
  
  
  
  1.98      +2 -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.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- TestRun.pm	11 Dec 2002 17:26:07 -0000	1.97
  +++ TestRun.pm	26 Jan 2003 03:14:04 -0000	1.98
  @@ -549,6 +549,8 @@
   
       $self->getopts(\@argv);
   
  +    $self->pre_configure() if $self->can('pre_configure');
  +
       $self->{test_config} = $self->new_test_config;
   
       $self->warn_core();
  
  
  
  1.10      +7 -2      httpd-test/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm
  
  Index: TestRunPerl.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRunPerl.pm,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TestRunPerl.pm	23 Jan 2003 04:06:38 -0000	1.9
  +++ TestRunPerl.pm	26 Jan 2003 03:14:04 -0000	1.10
  @@ -11,12 +11,17 @@
   use vars qw(@ISA);
   @ISA = qw(Apache::TestRun);
   
  +sub pre_configure {
  +    my $self = shift;
  +
  +    Apache::TestConfig::config_parse_skip_module_add('mod_perl.c');
  +
  +}
  +
   sub configure_modperl {
       my $self = shift;
   
       my $test_config = $self->{test_config};
  -
  -    $test_config->config_parse_skip_module_add('mod_perl.c');
   
       $test_config->preamble_register(qw(configure_libmodperl));
   
  
  
  

Mime
View raw message