cvs commit: modperl/t/docs rl.pl startup.pl

[do...@hyperreal.org]

dougm       98/09/21 11:33:21

  Modified:    .        Changes
               t/docs   rl.pl startup.pl
  Log:
  fix 'make test' @INC problem under NT, thanks to Dale Couch
  
  Revision  Changes    Path
  1.153     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.152
  retrieving revision 1.153
  diff -u -r1.152 -r1.153
  --- Changes	1998/09/20 00:03:43	1.152
  +++ Changes	1998/09/21 18:33:18	1.153
  @@ -8,6 +8,8 @@
   
   =item 1.15_02-dev
   
  +fix 'make test' @INC problem under NT, thanks to Dale Couch
  +
   =item 1.15_01 - September 19, 1998
   
   USE_DSO=1 may be fixed on some platforms w/ current 1.3.2-dev
  
  
  
  1.2       +3 -2      modperl/t/docs/rl.pl
  
  Index: rl.pl
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/docs/rl.pl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- rl.pl	1998/07/30 13:44:09	1.1
  +++ rl.pl	1998/09/21 18:33:19	1.2
  @@ -10,7 +10,8 @@
   	$Apache::Server::CWD."/t/net${uri}";
       });
   
  -    my $d = DirHandle->new("t/net/perl");
  +    my $path = Apache->server_root_relative("net/perl");
  +    my $d = DirHandle->new($path) or die "Can't open $path $!";
   
       for my $file ($d->read) {
   	next if $file eq "hooks.pl"; 
  @@ -18,7 +19,7 @@
   	Apache->untaint($file);
   	my $status = $rl->handler("/perl/$file");
   	unless($status == 200) {
  -	    die "pre-load of `/perl/$file' failed, status=$status\n";
  +	    warn "pre-load of `/perl/$file' failed, status=$status\n";
   	}
       }
   }
  
  
  
  1.21      +3 -2      modperl/t/docs/startup.pl
  
  Index: startup.pl
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/docs/startup.pl,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- startup.pl	1998/09/17 23:07:28	1.20
  +++ startup.pl	1998/09/21 18:33:20	1.21
  @@ -66,7 +66,7 @@
       }
   }
   else {
  -    require "./t/docs/rl.pl";
  +    require "docs/rl.pl";
   }
   #for testing perl mod_include's
   
  @@ -82,7 +82,8 @@
   #for testing PERL_HANDLER_METHODS
   #see httpd.conf and t/docs/LoadClass.pm
   
  -use LoadClass ();
  +require "docs/LoadClass.pm";
  +
   sub MyClass::method ($$) {
       my($class, $r) = @_;  
       #warn "$class->method called\n";