httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestConfigParse.pm TestConfigPerl.pm TestRun.pm TestRunPerl.pm
Date Tue, 14 May 2002 21:53:51 GMT
dougm       02/05/14 14:53:51

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
                        TestConfigParse.pm TestConfigPerl.pm TestRun.pm
                        TestRunPerl.pm
  Log:
  backing out change from yesterday that seems to have broken things
  
  Revision  Changes    Path
  1.131     +2 -0      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.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- TestConfig.pm	14 May 2002 00:27:16 -0000	1.130
  +++ TestConfig.pm	14 May 2002 21:53:51 -0000	1.131
  @@ -223,6 +223,8 @@
   
       $self->configure_apxs;
       $self->configure_httpd;
  +    $self->inherit_config; #see TestConfigParse.pm
  +    $self->configure_httpd_eapi; #must come after inherit_config
   
       $self->default_module(cgi    => [qw(mod_cgi mod_cgid)]);
       $self->default_module(thread => [qw(worker threaded)]);
  
  
  
  1.24      +0 -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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- TestConfigParse.pm	13 May 2002 18:49:20 -0000	1.23
  +++ TestConfigParse.pm	14 May 2002 21:53:51 -0000	1.24
  @@ -100,7 +100,6 @@
           my $name = basename $args->[1];
           $name =~ s/\.s[ol]$/.c/;  #mod_info.so => mod_info.c
           $name =~ s/^lib/mod_/; #libphp4.so => mod_php4.c
  -        next if $self->{modules}->{$name}; #already loaded
           debug "LoadModule $modname $name";
           $name = $modname_alias{$name} if $modname_alias{$name};
           $self->{modules}->{$name} = 1;
  
  
  
  1.51      +0 -1      httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm
  
  Index: TestConfigPerl.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- TestConfigPerl.pm	13 May 2002 18:49:20 -0000	1.50
  +++ TestConfigPerl.pm	14 May 2002 21:53:51 -0000	1.51
  @@ -30,7 +30,6 @@
       my $cfg = '';
   
       if (-e $vars->{libmodperl}) {
  -        $self->{modules}->{'mod_perl.c'} = 1;
           if (Apache::TestConfig::WIN32) {
               my $lib = "$Config{installbin}\\$Config{libperl}";
               $lib =~ s/lib$/dll/;
  
  
  
  1.89      +0 -2      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.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- TestRun.pm	13 May 2002 18:49:20 -0000	1.88
  +++ TestRun.pm	14 May 2002 21:53:51 -0000	1.89
  @@ -392,8 +392,6 @@
       }
   
       my $test_config = $self->{test_config};
  -    $test_config->inherit_config; #see TestConfigParse.pm
  -    $test_config->configure_httpd_eapi; #must come after inherit_config
       $test_config->sslca_generate;
       $test_config->generate_ssl_conf if $self->{opts}->{ssl};
       $test_config->cmodules_configure;
  
  
  
  1.6       +1 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestRunPerl.pm	13 May 2002 18:49:20 -0000	1.5
  +++ TestRunPerl.pm	14 May 2002 21:53:51 -0000	1.6
  @@ -16,7 +16,7 @@
   
       my $test_config = $self->{test_config};
   
  -    $test_config->configure_libmodperl;
  +    $test_config->preamble_register(qw(configure_libmodperl));
   
       $test_config->postamble_register(qw(configure_inc
                                           configure_pm_tests
  
  
  

Mime
View raw message