Author: stas Date: Wed Dec 1 14:28:00 2004 New Revision: 109387 URL: http://svn.apache.org/viewcvs?view=rev&rev=109387 Log: Tweak the handling of mp2 source build case in Apache::TestConfig::httpd_config(), apparently mp2 source build doesn't always know where httpd/apxs are, so we need to give a better error message in this particular case.
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diff&rev=109387&p1=httpd/test/trunk/perl-framework/Apache-Test/Changes&r1=109386&p2=httpd/test/trunk/perl-framework/Apache-Test/Changes&r2=109387 ============================================================================== --- httpd/test/trunk/perl-framework/Apache-Test/Changes (original) +++ httpd/test/trunk/perl-framework/Apache-Test/Changes Wed Dec 1 14:28:00 2004 @@ -8,6 +8,11 @@ =item 1.17-dev +Tweak the handling of mp2 source build case in +Apache::TestConfig::httpd_config(), apparently mp2 source build +doesn't always know where httpd/apxs are, so we need to give a better +error message in this particular case. [Stas] + Add cookie jar tests ["Christopher H. Laco" <apache-test chrislaco.com>] Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm?view=diff&rev=109387&p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm&r1=109386&p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm&r2=109387 ============================================================================== --- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm (original) +++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Wed Dec 1 14:28:00 2004 @@ -340,12 +340,23 @@ my $vars = $self->{vars}; unless ($vars->{httpd} or $vars->{apxs}) { - # mod_perl 2.0 build always knows the right httpd location - # (and optionally apxs) - if (IS_MOD_PERL_2_BUILD) { - # XXX: at the moment not sure what could go wrong, but it - # shouldn't enter interactive config, which doesn't work - # with mod_perl 2.0 build (by design) + # mod_perl 2.0 build (almost) always knows the right httpd + + # location (and optionally apxs). if we get here we can't + # continue because the interactive config can't work with + # mod_perl 2.0 build (by design) + if (IS_MOD_PERL_2_BUILD){ + my $mp2_build = modperl_build_config(); + # if mod_perl 2 was built against the httpd source it + # doesn't know where to find apxs/httpd, so in this case + # fall back to interactive config + unless ($mp2_build->{MP_APXS}) { + die "mod_perl 2 was built against Apache sources, we " . + "don't know where httpd/apxs executables are, therefore " . + "skipping the test suite execution" + } + + # not sure what else could go wrong but we can't continue die "something is wrong, mod_perl 2.0 build should have " . "supplied all the needed information to run the tests. " . "Please post lib/Apache/BuildConfig.pm along with the " .