perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r111907 - /perl/modperl/trunk/Changes /perl/modperl/trunk/lib/ModPerl/TestRun.pm
Date Wed, 15 Dec 2004 01:08:31 GMT
Author: stas
Date: Tue Dec 14 17:08:30 2004
New Revision: 111907

URL: http://svn.apache.org/viewcvs?view=rev&rev=111907
Log:
for make test, skip configuring fastcgi if it's found in the global
httpd.conf, as it causes crashes in the test suite

Modified:
   perl/modperl/trunk/Changes
   perl/modperl/trunk/lib/ModPerl/TestRun.pm

Modified: perl/modperl/trunk/Changes
Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&rev=111907&p1=perl/modperl/trunk/Changes&r1=111906&p2=perl/modperl/trunk/Changes&r2=111907
==============================================================================
--- perl/modperl/trunk/Changes	(original)
+++ perl/modperl/trunk/Changes	Tue Dec 14 17:08:30 2004
@@ -12,6 +12,9 @@
 
 =item 1.99_19-dev
 
+for make test, skip configuring fastcgi if it's found in the global
+httpd.conf, as it causes crashes in the test suite [Stas]
+
 fix Makefile.PL arguments parser to support more than one MP_foo
 option on the same line (including .makepl_args.mod_perl2 file) [Stas]
 

Modified: perl/modperl/trunk/lib/ModPerl/TestRun.pm
Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/TestRun.pm?view=diff&rev=111907&p1=perl/modperl/trunk/lib/ModPerl/TestRun.pm&r1=111906&p2=perl/modperl/trunk/lib/ModPerl/TestRun.pm&r2=111907
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/TestRun.pm	(original)
+++ perl/modperl/trunk/lib/ModPerl/TestRun.pm	Tue Dec 14 17:08:30 2004
@@ -62,11 +62,13 @@
     return $self;
 }
 
-# don't inherit LoadModule perl_module from the apache httpd.conf
+# - don't inherit LoadModule perl_module from the apache httpd.conf
+# - loaded fastcgi crashes some mp2 tests
+my %skip = map { ("$_.c" => 1) } qw(mod_perl fastcgi);
 sub should_skip_module {
     my($self, $name) = @_;
 
-    $name eq 'mod_perl.c' ? 1 : $self->SUPER::should_skip_module($name);
+    exists $skip{$name} ? 1 : $self->SUPER::should_skip_module($name);
 }
 
 1;

Mime
View raw message