httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject svn commit: r156013 - in httpd/apreq/branches/multi-env-unstable: module/apache/t/TEST.PL module/t/TEST.PL win32/Configure.pl win32/test_cgi.mak
Date Thu, 03 Mar 2005 06:22:16 GMT
Author: randyk
Date: Wed Mar  2 22:22:12 2005
New Revision: 156013

URL: http://svn.apache.org/viewcvs?view=rev&rev=156013
Log:
adjustments to get the module/t/ tests running on Win32.

Modified:
    httpd/apreq/branches/multi-env-unstable/module/apache/t/TEST.PL   (contents, props changed)
    httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL
    httpd/apreq/branches/multi-env-unstable/win32/Configure.pl
    httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak

Modified: httpd/apreq/branches/multi-env-unstable/module/apache/t/TEST.PL
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache/t/TEST.PL?view=diff&r1=156012&r2=156013
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache/t/TEST.PL (original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache/t/TEST.PL Wed Mar  2 22:22:12 2005
@@ -42,13 +42,14 @@
 use Apache::TestTrace;
 use Apache::TestConfigC;
 use Config;
+use File::Spec;
 use constant WIN32 => $^O eq 'MSWin32';
 
 use base 'Apache::TestConfig';
 
 sub cmodules_configure {
     my $self = shift;
-    my $dir = "$module_dir/apache/t/c-modules";
+    my $dir = File::Spec->catdir($module_dir, 'apache', 't', 'c-modules');
     $self->SUPER::cmodules_configure($dir);
 }
 sub cmodules_httpd_conf {

Propchange: httpd/apreq/branches/multi-env-unstable/module/apache/t/TEST.PL
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL?view=diff&r1=156012&r2=156013
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL (original)
+++ httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL Wed Mar  2 22:22:12 2005
@@ -42,13 +42,14 @@
 use Apache::TestTrace;
 use Apache::TestConfigC;
 use Config;
+use File::Spec;
 use constant WIN32 => $^O eq 'MSWin32';
 
 use base 'Apache::TestConfig';
 
 sub cmodules_configure {
     my $self = shift;
-    my $dir = "$module_dir/t/c-modules";
+    my $dir = File::Spec->catdir($module_dir, 't', 'c-modules');
     $self->SUPER::cmodules_configure($dir);
 }
 sub cmodules_httpd_conf {
@@ -73,13 +74,13 @@
         my @goners = map {$name . '.' . $_} qw(exp ilk lib pdb so lo);
         my $libs = join ' ', 
             (map {'-l' . File::Spec->catfile($mod_apreq2_dir, $_)}
-              qw(libapreq2.lib mod_apreq.lib));
+              qw(libapreq2.lib mod_apreq2.lib));
         print $fh <<EOF;
 APXS=$self->{APXS}
 all: $lib
 
 $lib: $name.c
-        \$(APXS) -I../../../apache2 -I../../../include $libs -llibhttpd $dversion -p -I$self->{cmodules_dir}
-c $name.c
+        \$(APXS) -I../../../apache2 -I../../../../include $libs -llibhttpd $dversion -p -I$self->{cmodules_dir}
-c $name.c
 
 clean:
 	-erase @goners vc60.pdb 

Modified: httpd/apreq/branches/multi-env-unstable/win32/Configure.pl
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/win32/Configure.pl?view=diff&r1=156012&r2=156013
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/Configure.pl (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/Configure.pl Wed Mar  2 22:22:12 2005
@@ -104,13 +104,13 @@
 
 if ($apxs) {
     $test .= << "END";
-        cd \$(APREQ_ENV)
+        cd \$(APREQ_MODULE)
         \$(PERL) t\\TEST.PL -apxs $apxs
         cd \$(APREQ_HOME)
 END
     $clean .= << 'END';
-        cd $(APREQ_ENV)
-        $(PERL) module\t\TEST.PL -clean
+        cd $(APREQ_MODULE)
+        $(PERL) t\TEST.PL -clean
         cd $(APREQ_HOME)
 END
 }
@@ -442,6 +442,7 @@
 PERLGLUE=$(APREQ_HOME)\glue\perl
 APACHE_LIB=$(APACHE)\lib
 TDIR=$(APREQ_HOME)\library\t
+APREQ_MODULE=$(APREQ_HOME)\module
 
 ALL : "$(LIBAPREQ)"
 

Modified: httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak?view=diff&r1=156012&r2=156013
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak Wed Mar  2 22:22:12 2005
@@ -48,7 +48,7 @@
 !ENDIF
 
 CFG_HOME=$(APREQ_HOME)\win32
-MODULE=$(CFG_HOME)\module
+MODULE=$(APREQ_HOME)\module
 OUTDIR=$(CFG_HOME)\libs
 INTDIR=$(CFG_HOME)\libs
 



Mime
View raw message