httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRun.pm
Date Thu, 11 Mar 2004 23:20:10 GMT
geoff       2004/03/11 15:20:10

  Modified:    perl-framework/Apache-Test Changes
               perl-framework/Apache-Test/lib/Apache TestRun.pm
  Log:
  $ENV{APACHE_TEST_NO_STICKY_PREFERENCES}, if true, will both suppress
  generation of persistent preferences and ignore any that already exist.
  
  Revision  Changes    Path
  1.111     +4 -0      httpd-test/perl-framework/Apache-Test/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- Changes	10 Mar 2004 07:03:31 -0000	1.110
  +++ Changes	11 Mar 2004 23:20:10 -0000	1.111
  @@ -8,6 +8,10 @@
   
   =item 1.10-dev
   
  +$ENV{APACHE_TEST_NO_STICKY_PREFERENCES}, if true, will both suppress
  +generation of persistent preferences and ignore any that already exist.
  +[Geoffrey Young]
  +
   make the project's test suite relocatable, handling the case where
   after Apache-Test configuration was created and not cleaned up before
   the directory was moved. This is especially important for those cases
  
  
  
  1.161     +15 -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.160
  retrieving revision 1.161
  diff -u -r1.160 -r1.161
  --- TestRun.pm	11 Mar 2004 06:12:09 -0000	1.160
  +++ TestRun.pm	11 Mar 2004 23:20:10 -0000	1.161
  @@ -1381,6 +1381,11 @@
   sub custom_config_save {
       my $self = shift;
   
  +    if ($ENV{APACHE_TEST_NO_STICKY_PREFERENCES}) {
  +        debug "skipping save of custom config data";
  +        return;
  +    }
  +
       my $vars = $self->{test_config}->{vars};
       my $conf_opts = $self->{conf_opts};
       my $config_dump = '';
  @@ -1533,6 +1538,12 @@
   
   my $custom_config_loaded = 0;
   sub custom_config_load {
  +
  +    if ($ENV{APACHE_TEST_NO_STICKY_PREFERENCES}) {
  +        debug "skipping load of custom config data";
  +        return;
  +    }
  +
       debug "trying to load custom config data";
   
       return if $custom_config_loaded;
  @@ -1808,6 +1819,10 @@
   C<APACHE_TEST_GROUP>) or by giving the relevant option (C<-httpd>,
   C<-apxs>, C<-port>, C<-user>, and C<-group>) when the C<TEST>
script
   is run.
  +
  +To avoid either using previous persistent configurations or saving
  +current configurations, set the C<APACHE_TEST_NO_STICKY_PREFERENCES>
  +environment variable to a true value.
   
   Finally it's possible to permanently override the previously saved
   options by passing C<L<-save|/Saving_Custom_Configuration_Options>>.
  
  
  

Mime
View raw message