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 ra...@apache.org on 2003/06/12 07:42:13 UTC
cvs commit: httpd-apreq-2/glue/perl/t TEST.PL
randyk 2003/06/11 22:42:13
Modified: glue/perl/t TEST.PL
Log:
Reviewed by: joes
For Win32,
- ensure cwd uses the long path name, in order to get the base directory
- adjust location of mod_apreq
Revision Changes Path
1.2 +8 -2 httpd-apreq-2/glue/perl/t/TEST.PL
Index: TEST.PL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/t/TEST.PL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TEST.PL 9 Jun 2003 04:00:45 -0000 1.1
+++ TEST.PL 12 Jun 2003 05:42:13 -0000 1.2
@@ -4,11 +4,17 @@
use warnings FATAL => 'all';
use lib qw(lib Apache-Test/lib);
+use Apache::Build;
+require Win32 if Apache::Build::WIN32;
use Cwd;
-cwd =~ m{^(.+httpd-apreq-2)} or die "Can't find base cvs directory";
+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::TestRunPerl';
@@ -18,6 +24,6 @@
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));
+ qq(LoadModule apreq_module "$env_dir_libs/mod_apreq.so"\n));
$self->SUPER::configure_modperl();
}