svn commit: r123138 - /httpd/apreq/trunk/env/t/TEST.PL /httpd/apreq/trunk/glue/perl/t/TEST.PL

[ra...@apache.org]

Author: randyk
Date: Wed Dec 22 12:28:23 2004
New Revision: 123138

URL: http://svn.apache.org/viewcvs?view=rev&rev=123138
Log:
Ensure Win32 uses the just-built libapreq2.dll (reported by Markus Wichitill)
Modified:
   httpd/apreq/trunk/env/t/TEST.PL
   httpd/apreq/trunk/glue/perl/t/TEST.PL

Modified: httpd/apreq/trunk/env/t/TEST.PL
Url: http://svn.apache.org/viewcvs/httpd/apreq/trunk/env/t/TEST.PL?view=diff&rev=123138&p1=httpd/apreq/trunk/env/t/TEST.PL&r1=123137&p2=httpd/apreq/trunk/env/t/TEST.PL&r2=123138
==============================================================================
--- httpd/apreq/trunk/env/t/TEST.PL	(original)
+++ httpd/apreq/trunk/env/t/TEST.PL	Wed Dec 22 12:28:23 2004
@@ -2,7 +2,6 @@
 use warnings FATAL => 'all';
 
 use constant WIN32 => $^O eq 'MSWin32';
-require Win32 if WIN32;
 
 use Cwd;
 my $cwd = WIN32 ?
@@ -26,6 +25,10 @@
 sub configure {
     my $self = shift;
     my $cfg = $self->{test_config};
+    # make sure Win32 uses the just-built libapreq2.dll
+    if (WIN32) {
+        $cfg->preamble(qq{LoadFile "$env_dir_libs/libapreq2.dll"\n});
+    }
     $cfg->preamble(IfModule => '!mod_apreq.c',
                qq(LoadModule apreq_module "$env_dir_libs/mod_apreq.so"\n));
     bless $cfg, "My::TestConfig";

Modified: httpd/apreq/trunk/glue/perl/t/TEST.PL
Url: http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/perl/t/TEST.PL?view=diff&rev=123138&p1=httpd/apreq/trunk/glue/perl/t/TEST.PL&r1=123137&p2=httpd/apreq/trunk/glue/perl/t/TEST.PL&r2=123138
==============================================================================
--- httpd/apreq/trunk/glue/perl/t/TEST.PL	(original)
+++ httpd/apreq/trunk/glue/perl/t/TEST.PL	Wed Dec 22 12:28:23 2004
@@ -4,10 +4,10 @@
 use warnings FATAL => 'all';
 use Apache2;
 use Apache::Build;
-require Win32 if Apache::Build::WIN32;
+use constant WIN32 => Apache::Build::WIN32;
 
 use Cwd;
-my $cwd = Apache::Build::WIN32 ?
+my $cwd = WIN32 ?
     Win32::GetLongPathName(cwd) : cwd;
 $cwd =~ m{^(.+)/glue/perl$} or die "Can't find base cvs directory";
 my $base_dir = $1;
@@ -29,6 +29,10 @@
 sub configure_modperl {
     my $self = shift;
     my $cfg = $self->{test_config};
+    # make sure Win32 uses the just-built libapreq2.dll
+    if (WIN32) {
+        $cfg->preamble(qq{LoadFile "$env_dir_libs/libapreq2.dll"\n});
+    }
     $cfg->preamble(IfModule => '!mod_apreq.c',
                qq(LoadModule apreq_module "$env_dir_libs/mod_apreq.so"\n));
     $self->SUPER::configure_modperl();