svn commit: r446503 - in /perl/modperl/trunk/t: conf/extra.last.conf.in response/TestDirective/perldo.pm

[pg...@apache.org]

Author: pgollucci
Date: Thu Sep 14 20:52:20 2006
New Revision: 446503

URL: http://svn.apache.org/viewvc?view=rev&rev=446503
Log:
If mod_alias wasn't loaded by httpd the recently added
PerlConfig tests would prevent the server from starting.

Submitted by: Fed Moyer <fr...@taperfriendlymusic.org>
Reviewed by: pgollucci,geoff

Modified:
    perl/modperl/trunk/t/conf/extra.last.conf.in
    perl/modperl/trunk/t/response/TestDirective/perldo.pm

Modified: perl/modperl/trunk/t/conf/extra.last.conf.in
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/conf/extra.last.conf.in?view=diff&rev=446503&r1=446502&r2=446503
==============================================================================
--- perl/modperl/trunk/t/conf/extra.last.conf.in (original)
+++ perl/modperl/trunk/t/conf/extra.last.conf.in Thu Sep 14 20:52:20 2006
@@ -114,20 +114,26 @@
 
 #Single-line $PerlConfig
 <Perl>
+if (Apache::Test::have_module('mod_alias.c')) {
   $PerlConfig = "Alias /perl_sections_perlconfig_scalar @DocumentRoot@";
+}
 </Perl>
 
 #Multi-line $PerlConfig
 <Perl>
+if (Apache::Test::have_module('mod_alias.c')) {
   $PerlConfig = "Alias /perl_sections_perlconfig_scalar1 @DocumentRoot@
                  Alias /perl_sections_perlconfig_scalar2 @DocumentRoot@
                 ";
+}
 </Perl>
 
 #@PerlConfig
 <Perl>
+if (Apache::Test::have_module('mod_alias.c')) {
   @PerlConfig = ("Alias /perl_sections_perlconfig_array1 @DocumentRoot@",
                  "Alias /perl_sections_perlconfig_array2 @DocumentRoot@",
                 );
+}
 </Perl>
 

Modified: perl/modperl/trunk/t/response/TestDirective/perldo.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestDirective/perldo.pm?view=diff&rev=446503&r1=446502&r2=446503
==============================================================================
--- perl/modperl/trunk/t/response/TestDirective/perldo.pm (original)
+++ perl/modperl/trunk/t/response/TestDirective/perldo.pm Thu Sep 14 20:52:20 2006
@@ -12,7 +12,7 @@
 sub handler {
     my $r = shift;
 
-    plan $r, tests => 22;
+    plan $r, tests => 22, need_module('mod_alias'); 
 
     ok t_cmp('yes', $TestDirective::perl::worked);