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).
Revision Changes Path
1.242 +18 -5
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -u -r1.241 -r1.242
--- TestConfig.pm 26 Aug 2004 23:58:58 -0000 1.241
+++ TestConfig.pm 27 Aug 2004 00:51:54 -0000 1.242
@@ -30,12 +30,13 @@
use constant IS_MOD_PERL_2 =>
eval { require mod_perl && $mod_perl::VERSION >= 1.99 } || 0;
-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();
+
use constant CUSTOM_CONFIG_FILE => 'Apache/TestConfigData.pm';
use File::Copy ();
@@ -325,12 +326,24 @@
sub httpd_config {
my $self = shift;
- my $vars = $self->{vars};
-
$self->configure_apxs;
$self->configure_httpd;
+ 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)
+ 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 " .
+ "bug report";
+ }
+
if ($ENV{APACHE_TEST_NO_STICKY_PREFERENCES}) {
error "You specified APACHE_TEST_NO_STICKY_PREFERENCES=1 " .
"in which case you must explicitly specify -httpd " .
1.161 +5 -0 httpd-test/perl-framework/Apache-Test/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -u -r1.160 -r1.161
--- Changes 26 Aug 2004 23:58:58 -0000 1.160
+++ Changes 27 Aug 2004 00:51:55 -0000 1.161
@@ -8,6 +8,11 @@
=item 1.14-dev
+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). [Stas]
+
Fix skip test suite functionality in the interactive configuration
phase [Stas]
