httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sander Temme <san...@temme.net>
Subject Re: svn commit: r372606 - /httpd/test/trunk/perl-framework/t/modules/info.t
Date Fri, 27 Jan 2006 08:33:52 GMT

On Jan 26, 2006, at 12:48 PM, colm@apache.org wrote:

> --- httpd/test/trunk/perl-framework/t/modules/info.t (original)
> +++ httpd/test/trunk/perl-framework/t/modules/info.t Thu Jan 26  
> 12:48:36 2006
> @@ -21,7 +21,7 @@
>      if ($_ =~ /<a name=\"(\w+\.c)\">/) {
>          if ($1 eq 'util_ldap.c') {
>              push(@actual,'mod_ldap.c');
> -        } elsif ($1 eq 'mod_imap.c') {
> +        } elsif ($1 eq 'mod_imap.c' && have_min_apache_version 
> ('2.1.5') ) {
>              push(@actual, 'mod_imagemap.c');
>          } else {
>              push(@actual, $1);

This does not work for me: this test still fails on 2.0.x because of  
the alias mapping done in Apache-Test/lib/Apache/TestConfigParse.pm:177.

When I take that out, and the above, the test works on both 2.0.x and  
2.2.x branches (didn't try trunk since I think the recent auth stuff  
has broken one of the test modules). Like so:

Index: t/modules/info.t
===================================================================
--- t/modules/info.t	(revision 372731)
+++ t/modules/info.t	(working copy)
@@ -21,8 +21,6 @@
      if ($_ =~ /<a name=\"(\w+\.c)\">/) {
          if ($1 eq 'util_ldap.c') {
              push(@actual,'mod_ldap.c');
-        } elsif ($1 eq 'mod_imap.c' && have_min_apache_version 
('2.1.5') ) {
-            push(@actual, 'mod_imagemap.c');
          } else {
              push(@actual, $1);
          }
Index: Apache-Test/lib/Apache/TestConfigParse.pm
===================================================================
--- Apache-Test/lib/Apache/TestConfigParse.pm	(revision 372731)
+++ Apache-Test/lib/Apache/TestConfigParse.pm	(working copy)
@@ -174,7 +174,6 @@
      'mod_proxy_balancer.c' => 'proxy_balancer.c',
      'mod_proxy_connect.c'  => 'proxy_connect.c',
      'mod_modperl.c'        => 'mod_perl.c',
-    'mod_imap.c'           => 'mod_imagemap.c',
);
#XXX mod_jk requires JkWorkerFile or JkWorker to be configured

I'm not sure I grok why the alias was in there, since I think that  
has is intended for modules where the filename doesn't map onto the  
module structure name, and the mod_imap -> mod_imagemap rename did  
not introduce such a discrepancy.

Was there a direct reason for the 'mod_imap.c' => 'mod_imagemap.c'  
hash entry? jorton?

S.

-- 
sander@temme.net              http://www.temme.net/sander/
PGP FP: 51B4 8727 466A 0BC3 69F4  B7B8 B2BE BC40 1529 24AF


Mime
View raw message