perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@hyperreal.org
Subject cvs commit: modperl/t/internal hooks.t
Date Wed, 20 Jan 1999 23:16:39 GMT
dougm       99/01/20 15:16:39

  Modified:    .        Changes
               apaci    load_modules.pl.PL
               t        TEST
               t/docs   startup.pl
               t/docs/auth .htaccess
               t/internal hooks.t
  Log:
  'make test' fixups:
  
   -for when other modules (e.g. auth, dirindex, type)
    come before mod_perl in the module list
   -exit graceful if LWP is still not installed
  
  Revision  Changes    Path
  1.250     +6 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.249
  retrieving revision 1.250
  diff -u -r1.249 -r1.250
  --- Changes	1999/01/20 18:35:18	1.249
  +++ Changes	1999/01/20 23:16:25	1.250
  @@ -9,6 +9,12 @@
   
   =item 1.17_01-dev
   
  +'make test' fixups:
  +
  + -for when other modules (e.g. auth, dirindex, type)
  +  come before mod_perl in the module list
  + -exit graceful if LWP is still not installed
  +
   loose @ISA 'DynaLoader' to avoid inheriting AutoLoader::AUTOLOAD
   
   added $r->server->timeout method
  
  
  
  1.2       +1 -0      modperl/apaci/load_modules.pl.PL
  
  Index: load_modules.pl.PL
  ===================================================================
  RCS file: /export/home/cvs/modperl/apaci/load_modules.pl.PL,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- load_modules.pl.PL	1998/06/08 01:01:29	1.1
  +++ load_modules.pl.PL	1999/01/20 23:16:30	1.2
  @@ -35,6 +35,7 @@
   	    $full = "../$full";
   	}
       }
  +    return if $name =~ /(auth|autoindex|digest)/; #a few that screw make test
       push @sh_mods, "LoadModule ${name}_module $full";
   }, $APACHE_SRC);
   
  
  
  
  1.7       +1 -0      modperl/t/TEST
  
  Index: TEST
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/TEST,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TEST	1998/12/11 22:33:38	1.6
  +++ TEST	1999/01/20 23:16:31	1.7
  @@ -57,6 +57,7 @@
   
   EOM
   	sleep(2);
  +        exit;
       }
       else {
          push(@tests, <modules/*.t>, <internal/*.t>);
  
  
  
  1.33      +1 -1      modperl/t/docs/startup.pl
  
  Index: startup.pl
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/docs/startup.pl,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- startup.pl	1999/01/20 18:35:31	1.32
  +++ startup.pl	1999/01/20 23:16:33	1.33
  @@ -165,7 +165,7 @@
   
       my $user = lc $r->connection->user;
       $r->notes("DoAuthenTest", 1);
  -
  +    
       unless($user eq "dougm" and $sent_pwd eq "mod_perl") {
           $r->note_basic_auth_failure;
           return AUTH_REQUIRED;
  
  
  
  1.4       +1 -0      modperl/t/docs/auth/.htaccess
  
  Index: .htaccess
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/docs/auth/.htaccess,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- .htaccess	1998/02/10 21:32:47	1.3
  +++ .htaccess	1999/01/20 23:16:35	1.4
  @@ -2,6 +2,7 @@
   AuthName mod_perl
   AuthType Basic
   PerlAuthenHandler Apache::AuthenTest
  +PerlAuthzHandler Apache::OK
   require valid-user
   
   #<Perl>
  
  
  
  1.4       +16 -4     modperl/t/internal/hooks.t
  
  Index: hooks.t
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/internal/hooks.t,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- hooks.t	1998/07/18 22:10:04	1.3
  +++ hooks.t	1999/01/20 23:16:38	1.4
  @@ -50,7 +50,10 @@
   }
   
   print "1..$hook_tests\n";
  -$i = 1;
  +$i = 0;
  +#if mod_mime is configured shared and mod_perl static,
  +#PerlTypeHandler wont be run
  +my $forgive = 1;
   
   open HOOKS, "docs/hooks.txt";
   while(<HOOKS>) {
  @@ -58,9 +61,18 @@
       s/^\s*//; s/\s*$//;
       next unless $_;
       next if $Seen{$_}++;
  -    print "ok $i\n"; $i++;
  -    last if $i > $hook_tests;
  +    $i++;
  +    print "ok $i\n";
  +    last if $i >= $hook_tests;
   }
   close HOOKS;
   
  -unlink "docs/.htaccess";
  +if ($i < $hook_tests) {
  +    for (1..$forgive) {
  +	++$i; print "ok $i\n";
  +    }
  +}
  +
  +END {
  +    unlink "docs/.htaccess";
  +}
  
  
  

Mime
View raw message