stas 2004/07/15 13:33:57
Modified: perl-framework/Apache-Test/lib/Apache TestRun.pm
perl-framework/Apache-Test Changes
Log:
When APACHE_TEST_NO_STICKY_PREFERENCES=1 is used don't even try to
interactively configure the server, as we don't save any config it was
entering an infinite loop.
Revision Changes Path
1.172 +7 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Index: TestRun.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -u -r1.171 -r1.172
--- TestRun.pm 24 Jun 2004 13:25:30 -0000 1.171
+++ TestRun.pm 15 Jul 2004 20:33:57 -0000 1.172
@@ -552,6 +552,13 @@
my $test_config = $self->{test_config};
unless ($test_config->{vars}->{httpd} or $test_config->{vars}->{apxs}) {
+ if ($ENV{APACHE_TEST_NO_STICKY_PREFERENCES}) {
+ error "You specified APACHE_TEST_NO_STICKY_PREFERENCES=1 " .
+ "in which case you must explicitly specify -httpd" .
+ "and/or -apxs options";
+ exit_perl 0;
+ }
+
$self->opt_clean(1);
# this method restarts the whole program via exec
# so it never returns
1.149 +4 -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.148
retrieving revision 1.149
diff -u -u -r1.148 -r1.149
--- Changes 15 Jul 2004 00:01:45 -0000 1.148
+++ Changes 15 Jul 2004 20:33:57 -0000 1.149
@@ -8,6 +8,10 @@
=item 1.13-dev
+When APACHE_TEST_NO_STICKY_PREFERENCES=1 is used don't even try to
+interactively configure the server, as we don't save any config it was
+entering an infinite loop. [Stas]
+
If a directory t/lib exists from where the tests are run, adjust
@INC so that this directory is added when running the tests,
both within t/TEST and within t/conf/modperl_inc.pl.
