[EMAIL PROTECTED] wrote:
> stas 2004/08/26 17:51:55
>
> Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
> perl-framework/Apache-Test Changes
> Log:
> Make sure that when Apache-Test is a part of modperl-2.0 checkout, the
> interactive configuration is properly run (it must not be run when
> mod_perl 2.0 is tested since it should have all the info needed to run
> the tests).
>
> -use constant IS_MOD_PERL_2_BUILD => IS_MOD_PERL_2 &&
> - require Apache::Build && Apache::Build::IS_MOD_PERL_BUILD();
> -
> use constant IS_APACHE_TEST_BUILD =>
> grep { -e "$_/lib/Apache/TestConfig.pm" } qw(Apache-Test . ..);
>
> +use constant IS_MOD_PERL_2_BUILD =>
> + IS_MOD_PERL_2 && !IS_APACHE_TEST_BUILD &&
> + require Apache::Build && Apache::Build::IS_MOD_PERL_BUILD();
> +
this borked the mod_perl build. IS_APACHE_TEST_BUILD now reports back true
for a mod_perl checkout, which makes IS_MOD_PERL_2_BUILD false. the result
is that Apache2.pm is added to t/TEST but lib/ is not, so t/TEST can't run
on a fresh checkout (where there are no mod_perl files in site_lib).
I think the attached patch makes more sense, but I'm not sure if it collides
with the problem you were trying to solve.
--Geoff
Index: Apache-Test/lib/Apache/TestConfig.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.243
diff -u -r1.243 TestConfig.pm
--- Apache-Test/lib/Apache/TestConfig.pm 27 Aug 2004 01:03:55 -0000 1.243
+++ Apache-Test/lib/Apache/TestConfig.pm 3 Sep 2004 14:23:24 -0000
@@ -31,7 +31,7 @@
eval { require mod_perl && $mod_perl::VERSION >= 1.99 } || 0;
use constant IS_APACHE_TEST_BUILD =>
- grep { -e "$_/lib/Apache/TestConfig.pm" } qw(Apache-Test . ..);
+ grep { -e "$_/lib/Apache/TestConfig.pm" } qw(. ..);
use constant IS_MOD_PERL_2_BUILD =>
IS_MOD_PERL_2 && !IS_APACHE_TEST_BUILD &&
