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 TestRun.pm
Date Wed, 18 Feb 2004 04:09:08 GMT
stas        2004/02/17 20:09:08

  Modified:    perl-framework/Apache-Test/lib/Apache TestRun.pm
  Log:
  mod_perl 2.0 build always knows the right httpd location (and
  optionally apxs). so allow overriding to all but 'httpd' and 'apxs'
  values.
  
  Revision  Changes    Path
  1.149     +9 -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.148
  retrieving revision 1.149
  diff -u -u -r1.148 -r1.149
  --- TestRun.pm	9 Feb 2004 18:07:49 -0000	1.148
  +++ TestRun.pm	18 Feb 2004 04:09:08 -0000	1.149
  @@ -1178,6 +1178,11 @@
       my $vars_must_overriden = grep {
           $ENV{ $vars_to_env{$_} } || $args->{$_}
       } @data_vars_must;
  +
  +    # mod_perl 2.0 build always knows the right httpd location (and
  +    # optionally apxs)
  +    $vars_must_overriden++ if Apache::TestConfig::IS_MOD_PERL_2_BUILD();
  +
       unless ($vars_must_overriden) {
           for (@data_vars_must) {
               next unless $Apache::TestConfigData::vars->{$_};
  @@ -1736,6 +1741,10 @@
             - run interactive prompt for C<httpd> and optionally for C<apxs>
             - save the custom config in lib/Apache/TestConfigData.pm
             - restart the currently run program
  +
  +  modperl-2.0 is a special case in (3). it always overrides 'httpd'
  +  and 'apxs' settings. Other settings like 'port', can be used from
  +  the saved config.
   
     4) make install
   
  
  
  

Mime
View raw message