You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2003/06/16 11:37:45 UTC
cvs commit: httpd-apreq-2/env/t TEST.PL
joes 2003/06/16 02:37:45
Modified: build test_config.pl
Added: env/t TEST.PL
Log:
env/ tests were using wrong Apache::Test config info- should be fixed now
Revision Changes Path
1.4 +3 -12 httpd-apreq-2/build/test_config.pl
Index: test_config.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/build/test_config.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test_config.pl 13 Jun 2003 01:21:32 -0000 1.3
+++ test_config.pl 16 Jun 2003 09:37:45 -0000 1.4
@@ -44,19 +44,10 @@
close $fh or die "close $makefile: $!";
}
+Apache::TestMM::filter_args();
+Apache::TestMM::generate_script("t/TEST");
$Apache::TestTrace::Level = 'debug';
-bless my $cfg = Apache::Test->config();
-unless (-d "t/conf") {
- warn "Creating t/conf directory.";
- mkdir "t/conf" or die "mkdir 't/conf' failed: $!";
-}
-
-$cfg->preamble(LoadModule => [apreq_module => "../.libs/mod_apreq.so"]);
+bless my $cfg = Apache::Test->config();
$cfg->cmodules_configure;
-$cfg->generate_httpd_conf;
-
-Apache::TestMM::filter_args();
-Apache::TestRun->generate_script;
-
1.1 httpd-apreq-2/env/t/TEST.PL
Index: TEST.PL
===================================================================
use strict;
use warnings FATAL => 'all';
use Apache2;
use Apache::Build;
require Win32 if Apache::Build::WIN32;
use Cwd;
my $cwd = Apache::Build::WIN32 ?
Win32::GetLongPathName(cwd) : cwd;
$cwd =~ m{^(.+httpd-apreq-2)} or die "Can't find base cvs directory";
my $base_dir = $1;
my $env_dir = "$base_dir/env";
my $env_dir_libs = Apache::Build::WIN32 ?
"$base_dir/win32/libs" : "$env_dir/.libs";
use base 'Apache::TestRun';
main::->new->run(@ARGV);
sub configure {
my $self = shift;
my $cfg = $self->{test_config};
$cfg->preamble(IfModule => '!mod_apreq.c',
qq(LoadModule apreq_module "$env_dir_libs/mod_apreq.so"\n));
$self->SUPER::configure();
}