Return-Path: <modperl-cvs-owner-modperl-cvs-archive=hyperreal.org@apache.org>
Delivered-To: modperl-cvs-archive@hyperreal.org
Received: (qmail 29944 invoked by uid 6000); 26 Mar 1999 20:23:30 -0000
Received: (qmail 29787 invoked by uid 169); 26 Mar 1999 20:23:19 -0000
Date: 26 Mar 1999 20:23:19 -0000
Message-ID: <19990326202319.29786.qmail@hyperreal.org>
From: dougm@hyperreal.org
To: modperl-cvs@hyperreal.org
Subject: cvs commit: modperl/t/modules cookie.t
Sender: modperl-cvs-owner@apache.org
Precedence: bulk
Reply-To: modperl-cvs@apache.org

dougm       99/03/26 12:23:17

  Modified:    .        Changes ToDo
               lib/Apache src.pm
               t/conf   httpd.conf-dist
               t/docs   startup.pl
               t/modules cookie.t
  Log:
  some minor test fixups for when certain things are not installed and
  be sure $ENV{PERL5LIB} is used (Perl ignores w/ -T)
  
  Revision  Changes    Path
  1.271     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.270
  retrieving revision 1.271
  diff -u -r1.270 -r1.271
  --- Changes	1999/03/26 19:59:41	1.270
  +++ Changes	1999/03/26 20:22:53	1.271
  @@ -8,6 +8,9 @@
   
   =item 1.18_01-dev
   
  +some minor test fixups for when certain things are not installed and
  +be sure $ENV{PERL5LIB} is used (Perl ignores w/ -T)
  +
   print() now returns true on success, false on failure (1.3.6+)
   
   no longer set SIGPIPE handler if Apache >= 1.3.6
  
  
  
  1.169     +0 -6      modperl/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /home/cvs/modperl/ToDo,v
  retrieving revision 1.168
  retrieving revision 1.169
  diff -u -r1.168 -r1.169
  --- ToDo	1999/03/26 19:59:42	1.168
  +++ ToDo	1999/03/26 20:22:55	1.169
  @@ -19,12 +19,6 @@
   
   - Makefile.PL should always push load_modules.pl for 'make test' 
   
  -- t/modules/cookie must test have_module "CGI::Cookie"
  -
  -- dorighthing if t/modules/status.t can see Devel::Symdump, but httpd cant
  -
  -- cure Apache::src::module_magic_number warnings when there are no header files
  -
   - ap_parse_htaccess like interface 
   
   - make PERL_STARTUP_DONE_CHECK=1 default for win32?
  
  
  
  1.13      +2 -0      modperl/lib/Apache/src.pm
  
  Index: src.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/src.pm,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- src.pm	1999/01/21 21:20:17	1.12
  +++ src.pm	1999/03/26 20:22:59	1.13
  @@ -131,6 +131,8 @@
       my $self = shift;
       my $d = asrc(shift || $self->dir);
   
  +    return 0 unless $d;
  +
       #return $mcache{$d} if $mcache{$d};
       my $fh;
       for (qw(ap_mmn.h http_config.h)) {
  
  
  
  1.23      +1 -1      modperl/t/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===================================================================
  RCS file: /home/cvs/modperl/t/conf/httpd.conf-dist,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- httpd.conf-dist	1999/01/26 00:17:59	1.22
  +++ httpd.conf-dist	1999/03/26 20:23:03	1.23
  @@ -47,7 +47,7 @@
   #mod_perl stuff
   
   
  -PerlPassEnv TERM EDITOR NOCHANCE USER
  +PerlPassEnv TERM EDITOR NOCHANCE USER PERL5LIB
   PerlSetEnv KeyForPerlSetEnv OK
   PerlSetVar KeyForPerlSetVar OK
    
  
  
  
  1.35      +3 -0      modperl/t/docs/startup.pl
  
  Index: startup.pl
  ===================================================================
  RCS file: /home/cvs/modperl/t/docs/startup.pl,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- startup.pl	1999/01/21 00:38:22	1.34
  +++ startup.pl	1999/03/26 20:23:07	1.35
  @@ -10,6 +10,9 @@
   
       use lib map { "$Apache::Server::CWD/$_" } qw(t/docs blib/lib blib/arch);
       require "blib.pl" if -e "./t/docs/blib.pl";
  +    #Perl ignores w/ -T
  +    unshift @INC, split ":", $ENV{PERL5LIB} if $ENV{PERL5LIB};
  +
       $Apache::Server::Starting or warn "Server is not starting !?\n";
       \$Apache::Server::Starting == \$Apache::ServerStarting or 
   	warn "GV alias broken\n";
  
  
  
  1.5       +1 -0      modperl/t/modules/cookie.t
  
  Index: cookie.t
  ===================================================================
  RCS file: /home/cvs/modperl/t/modules/cookie.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- cookie.t	1999/01/19 21:26:09	1.4
  +++ cookie.t	1999/03/26 20:23:13	1.5
  @@ -5,6 +5,7 @@
   my $Is_dougm = (defined($ENV{USER}) && ($ENV{USER} eq "dougm"));
   
   skip_test unless have_module "Apache::Cookie";
  +skip_test unless have_module "CGI::Cookie";
   
   unless (Apache::src->mmn_eq) {
       skip_test if not $Is_dougm;