You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-commits@perl.apache.org by ge...@apache.org on 2005/07/22 17:27:30 UTC
svn commit: r220340 - /perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
Author: geoff
Date: Fri Jul 22 08:27:28 2005
New Revision: 220340
URL: http://svn.apache.org/viewcvs?rev=220340&view=rev
Log:
more tweaks - should work now
Modified:
perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/trunk/lib/Apache/TestConfig.pm?rev=220340&r1=220339&r2=220340&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfig.pm Fri Jul 22 08:27:28 2005
@@ -176,6 +176,8 @@
my $self = shift;
+ my $server = ref $self ? $self->server : new_test_server();
+
# we don't want to get mp2 preconfigured data in order to be able
# to get the interactive tests running.
return undef if $ENV{APACHE_TEST_INTERACTIVE_CONFIG_TEST};
@@ -184,9 +186,9 @@
# even if mod_perl2 is installed on the box
# similarly, we shouldn't be loading mp2 if we're not
# absolutely certain we're in a 2.X environment yet
- # (such as mod_perl's own build environment)
- if (($self->server->{rev} && $self->server->{rev} == 2) ||
- IS_MOD_PERL_2_BUILD) {
+ # (such as mod_perl's own build or runtime environment)
+ if (($server->{rev} && $server->{rev} == 2) ||
+ IS_MOD_PERL_2_BUILD || $ENV{MOD_PERL_API_VERSION}) {
eval {
require Apache2::Build;
} or return;