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 Changes
Date Tue, 20 May 2003 06:01:38 GMT
stas        2003/05/19 23:01:38

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
               perl-framework/Apache-Test Changes
  Log:
  pass to 'use lib' only 'lib/' dirs that actually exist in
  autogenerated t/TEST t/SMOKE and others.
  
  Revision  Changes    Path
  1.162     +16 -3     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.161
  retrieving revision 1.162
  diff -u -r1.161 -r1.162
  --- TestConfig.pm	15 May 2003 03:26:18 -0000	1.161
  +++ TestConfig.pm	20 May 2003 06:01:38 -0000	1.162
  @@ -769,14 +769,27 @@
   }
   
   sub perlscript_header {
  -    return <<'EOF';
  +
  +    require FindBin;
  +
  +    # the live 'lib/' dir of the distro (e.g. modperl-2.0/ModPerl-Registry/lib)
  +    my @dirs = qw(lib);
  +
  +    # the live dir of the top dir if any  (e.g. modperl-2.0/lib)
  +    if (-e catfile($FindBin::Bin, "..", "Makefile.PL") &&
  +        -d catdir($FindBin::Bin, "..", "lib") ) {
  +        push @dirs, '../lib';
  +    }
  +
  +    push @dirs, 'Apache-Test' if IS_MOD_PERL_2_BUILD;
  +
  +    return <<"EOF";
   
   use strict;
   use warnings FATAL => 'all';
   
   use FindBin;
  -use lib map "$FindBin::Bin/$_",
  -        qw(../Apache-Test/lib ../lib ../../lib);
  +use lib map "\$FindBin::Bin/../\$_", qw(@dirs);
   
   EOF
   }
  
  
  
  1.23      +3 -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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Changes	19 May 2003 23:30:22 -0000	1.22
  +++ Changes	20 May 2003 06:01:38 -0000	1.23
  @@ -8,6 +8,9 @@
   
   =item 1.03-dev - 
   
  +pass to 'use lib' only 'lib/' dirs that actually exist in
  +autogenerated t/TEST t/SMOKE and others. [Stas]
  +
   add the ASF LICENSE file to the distro [Stas]
   
   get rid of Apache::TestTrace's dependency on Apache::TestConfig as it
  
  
  

Mime
View raw message