httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestConfigPerl.pm
Date Thu, 15 Jul 2004 00:01:46 GMT
randyk      2004/07/14 17:01:46

  Modified:    perl-framework/Apache-Test Changes
               perl-framework/Apache-Test/lib/Apache TestConfig.pm
                        TestConfigPerl.pm
  Log:
  Reviewed by:	stas
  adjust @INC so as to add a directory t/lib, if it exists,
  when running the tests.
  
  Revision  Changes    Path
  1.148     +6 -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.147
  retrieving revision 1.148
  diff -u -r1.147 -r1.148
  --- Changes	9 Jul 2004 20:01:26 -0000	1.147
  +++ Changes	15 Jul 2004 00:01:45 -0000	1.148
  @@ -8,6 +8,12 @@
   
   =item 1.13-dev
   
  +If a directory t/lib exists from where the tests are run, adjust
  +@INC so that this directory is added when running the tests,
  +both within t/TEST and within t/conf/modperl_inc.pl.
  +This allows inclusion of modules specific to the tests that 
  +aren't intended to be installed. [Stas, Randy]
  +
   make a special case for threaded mpm configuration, to ensure that
   unless maxclients was specified, MaxClients will be exactly twice
   bigger than ThreadsPerChild (minclients), since if we don't do that,
  
  
  
  1.228     +5 -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.227
  retrieving revision 1.228
  diff -u -r1.227 -r1.228
  --- TestConfig.pm	5 Jul 2004 15:58:00 -0000	1.227
  +++ TestConfig.pm	15 Jul 2004 00:01:46 -0000	1.228
  @@ -881,6 +881,11 @@
           }
       }
   
  +    {
  +        my $dir = canonpath catdir $FindBin::Bin, "t", "lib";
  +        push @dirs, $dir if -d $dir;
  +    }
  +
       my $dirs = join("\n    ", '', @dirs) . "\n";;
   
       return <<"EOF";
  
  
  
  1.90      +4 -0      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.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- TestConfigPerl.pm	28 Apr 2004 18:03:41 -0000	1.89
  +++ TestConfigPerl.pm	15 Jul 2004 00:01:46 -0000	1.90
  @@ -183,6 +183,10 @@
               next unless $_;
               print $fh "use lib '$_';\n";
           }
  +        my $tlib = catdir $self->{vars}->{t_dir}, 'lib';
  +        if (-d $tlib) {
  +            print $fh "use lib '$tlib';\n";
  +        }
           my $fixup = Apache::TestConfig->modperl_2_inc_fixup();
           print $fh $fixup;
   
  
  
  

Mime
View raw message