geoff 2003/11/07 11:39:47
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
TestServer.pm
Log:
change -timeout to -startup_timeout and match %ENV entry
Revision Changes Path
1.184 +25 -25
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.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- TestConfig.pm 7 Nov 2003 15:52:40 -0000 1.183
+++ TestConfig.pm 7 Nov 2003 19:39:47 -0000 1.184
@@ -35,31 +35,31 @@
use vars qw(%Usage);
%Usage = (
- top_dir => 'top-level directory (default is $PWD)',
- t_dir => 'the t/ test directory (default is $top_dir/t)',
- t_conf => 'the conf/ test directory (default is $t_dir/conf)',
- t_logs => 'the logs/ test directory (default is $t_dir/logs)',
- t_conf_file => 'test httpd.conf file (default is $t_conf/httpd.conf)',
- src_dir => 'source directory to look for mod_foos.so',
- serverroot => 'ServerRoot (default is $t_dir)',
- documentroot => 'DocumentRoot (default is $ServerRoot/htdocs',
- port => 'Port [port_number|select] (default ' . DEFAULT_PORT .
')',
- servername => 'ServerName (default is localhost)',
- user => 'User to run test server as (default is $USER)',
- group => 'Group to run test server as (default is $GROUP)',
- bindir => 'Apache bin/ dir (default is apxs -q BINDIR)',
- sbindir => 'Apache sbin/ dir (default is apxs -q SBINDIR)',
- 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)',
- proxyssl_url => 'url for testing ProxyPass / https (default is
localhost)',
- sslca => 'location of SSL CA (default is $t_conf/ssl/ca)',
- sslcaorg => 'SSL CA organization to use for tests (default is asf)',
- libmodperl => 'path to mod_perl\'s .so (full or relative to
LIBEXECDIR)',
+ top_dir => 'top-level directory (default is $PWD)',
+ t_dir => 'the t/ test directory (default is $top_dir/t)',
+ t_conf => 'the conf/ test directory (default is $t_dir/conf)',
+ t_logs => 'the logs/ test directory (default is $t_dir/logs)',
+ t_conf_file => 'test httpd.conf file (default is $t_conf/httpd.conf)',
+ src_dir => 'source directory to look for mod_foos.so',
+ serverroot => 'ServerRoot (default is $t_dir)',
+ documentroot => 'DocumentRoot (default is $ServerRoot/htdocs',
+ port => 'Port [port_number|select] (default ' . DEFAULT_PORT .
')',
+ servername => 'ServerName (default is localhost)',
+ user => 'User to run test server as (default is $USER)',
+ group => 'Group to run test server as (default is $GROUP)',
+ bindir => 'Apache bin/ dir (default is apxs -q BINDIR)',
+ sbindir => 'Apache sbin/ dir (default is apxs -q SBINDIR)',
+ 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)',
+ startup_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)',
+ proxyssl_url => 'url for testing ProxyPass / https (default is
localhost)',
+ sslca => 'location of SSL CA (default is $t_conf/ssl/ca)',
+ sslcaorg => 'SSL CA organization to use for tests (default is
asf)',
+ libmodperl => 'path to mod_perl\'s .so (full or relative to
LIBEXECDIR)',
(map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access
auth)),
);
1.70 +2 -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.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- TestServer.pm 7 Nov 2003 15:52:40 -0000 1.69
+++ TestServer.pm 7 Nov 2003 19:39:47 -0000 1.70
@@ -522,8 +522,8 @@
$mpm = "($mpm MPM)" if $mpm;
print "using $version $mpm\n";
- my $timeout = $vars->{timeout} ||
- $ENV{APACHE_TEST_START_TIMEOUT} ||
+ my $timeout = $vars->{startup_timeout} ||
+ $ENV{APACHE_TEST_STARTUP_TIMEOUT} ||
60;
my $start_time = time;
