geoff 2003/11/07 07:52:40
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
TestServer.pm
Log:
added -timeout and $ENV{APACHE_TEST_START_TIMEOUT} as places
to specify the maximum number of seconds to wait for the test
server to start. the default is still 60 seconds.
Revision Changes Path
1.183 +1 -0
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.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- TestConfig.pm 7 Nov 2003 08:48:21 -0000 1.182
+++ TestConfig.pm 7 Nov 2003 15:52:40 -0000 1.183
@@ -52,6 +52,7 @@
httpd => 'server to use for testing (default is $bindir/httpd)',
target => 'name of server binary (default is apxs -q TARGET)',
apxs => 'location of apxs (default is from Apache::BuildConfig)',
+ timeout => 'seconds to wait for the server to start (default is
60)',
httpd_conf => 'inherit config from this file (default is apxs
derived)',
maxclients => 'maximum number of concurrent clients (default is 1)',
perlpod => 'location of perl pod documents (for testing downloads)',
1.69 +4 -2
httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm
Index: TestServer.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- TestServer.pm 20 Oct 2003 20:09:05 -0000 1.68
+++ TestServer.pm 7 Nov 2003 15:52:40 -0000 1.69
@@ -522,10 +522,12 @@
$mpm = "($mpm MPM)" if $mpm;
print "using $version $mpm\n";
- my $timeout = 60; # secs XXX: make a constant?
+ my $timeout = $vars->{timeout} ||
+ $ENV{APACHE_TEST_START_TIMEOUT} ||
+ 60;
my $start_time = time;
- my $preamble = "${CTRL_M}waiting for server to start: ";
+ my $preamble = "${CTRL_M}waiting $timeout seconds for server to start: ";
print $preamble unless COLOR;
while (1) {
my $delta = time - $start_time;
