[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-modperl-cvs
Subject:    svn commit: r371915 - in /perl/modperl/trunk/t: conf/extra.last.conf.in
From:       geoff () apache ! org
Date:       2006-01-24 13:55:41
Message-ID: 20060124135542.4319.qmail () minotaur ! apache ! org
[Download RAW message or body]

Author: geoff
Date: Tue Jan 24 05:55:39 2006
New Revision: 371915

URL: http://svn.apache.org/viewcvs?rev=371915&view=rev
Log:
add simple tests to make sure $ENV{MOD_PERL}
and $ENV{MOD_PERL_API_VERSION} are set as soon
as possible

Modified:
    perl/modperl/trunk/t/conf/extra.last.conf.in
    perl/modperl/trunk/t/hooks/TestHooks/startup.pm

Modified: perl/modperl/trunk/t/conf/extra.last.conf.in
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/conf/extra.last.conf.in?rev=371915&r1=371914&r2=371915&view=diff
 ==============================================================================
--- perl/modperl/trunk/t/conf/extra.last.conf.in (original)
+++ perl/modperl/trunk/t/conf/extra.last.conf.in Tue Jan 24 05:55:39 2006
@@ -67,6 +67,13 @@
 $TestDirective::perl::base_server = Apache2::PerlSections->server;
 </Perl>
 
+<Perl >
+# make sure that these are set at the earliest possible time
+die '$ENV{MOD_PERL} not set!' unless $ENV{MOD_PERL};
+die '$ENV{MOD_PERL_API_VERSION} not set!'
+    unless $ENV{MOD_PERL_API_VERSION} == 2;
+</Perl>
+
 <VirtualHost perlsections>
   <Perl >
     $TestDirective::perl::vhost_server = Apache2::PerlSections->server;

Modified: perl/modperl/trunk/t/hooks/TestHooks/startup.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/hooks/TestHooks/startup.pm?rev=371915&r1=371914&r2=371915&view=diff
 ==============================================================================
--- perl/modperl/trunk/t/hooks/TestHooks/startup.pm (original)
+++ perl/modperl/trunk/t/hooks/TestHooks/startup.pm Tue Jan 24 05:55:39 2006
@@ -62,6 +62,11 @@
 
     my $val = $s->dir_config->{PostConfig} or die "Can't read PostConfig var";
 
+    # make sure that these are set at the earliest possible time
+    die '$ENV{MOD_PERL} not set!' unless $ENV{MOD_PERL};
+    die '$ENV{MOD_PERL_API_VERSION} not set!'
+        unless $ENV{MOD_PERL_API_VERSION} == 2;
+
     my $port = $s->port;
     my $file = catfile $dir, "$phase-$port";
 


[prev in list] [next in list] [prev in thread] [next in thread]