httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ruediger Pluem <rpl...@apache.org>
Subject Re: svn commit: r945879 - /httpd/test/framework/trunk/t/modules/info.t
Date Sun, 23 May 2010 14:13:56 GMT
On 18.05.2010 22:53, sf@apache.org wrote:
> Author: sf
> Date: Tue May 18 20:53:43 2010
> New Revision: 945879
> 
> URL: http://svn.apache.org/viewvc?rev=945879&view=rev
> Log:
> Fix for shared MPM builds
> 
> Modified:
>     httpd/test/framework/trunk/t/modules/info.t
> 
> Modified: httpd/test/framework/trunk/t/modules/info.t
> URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/info.t?rev=945879&r1=945878&r2=945879&view=diff
> ==============================================================================
> --- httpd/test/framework/trunk/t/modules/info.t (original)
> +++ httpd/test/framework/trunk/t/modules/info.t Tue May 18 20:53:43 2010
> @@ -19,10 +19,15 @@ my (@actual,@expected) = ((),());
>  ## extract module names from html ##
>  foreach (split /\n/, $info) {
>      if ($_ =~ /<a name=\"(\w+\.c)\">/) {
> -        if ($1 eq 'util_ldap.c') {
> +        my $name = $1;
> +        if ($name eq 'util_ldap.c') {
>              push(@actual,'mod_ldap.c');
> +        } elsif ($name =~ /^(?:event|prefork|worker)\.c$/) {
> +            push(@actual,"mod_mpm_$name");
> +        } elsif ($name eq 'simple_api.c') {
> +            push(@actual,"mod_mpm_simple.c");
>          } else {
> -            push(@actual, $1);
> +            push(@actual, $name);
>          }
>      }
>  }
> 
> 

This seems to fail with non shared builds of mpms:

# Running under perl version 5.010000 for linux
# Current time local: Sun May 23 16:11:26 2010
# Current time GMT:   Sun May 23 14:11:26 2010
# Using Test.pm version 1.25
# Using Apache/Test.pm version 1.33
comparing expected ->mod_negotiation.c<-
to actual ->mod_mpm_worker.c<-
actual:
core.c http_core.c mod_access_compat.c mod_actions.c mod_alias.c mod_asis.c
mod_auth_basic.c mod_auth_digest.c mod_authany.c mod_authn_anon.c
mod_authn_core.c mod_authn_dbm.c mod_authn_file.c mod_authz_core.c
mod_authz_dbm.c mod_authz_groupfile.c mod_authz_host.c mod_authz_owner.c
mod_authz_user.c mod_autoindex.c mod_bucketeer.c mod_cache.c mod_case_filter.c
mod_case_filter_in.c mod_cern_meta.c mod_cgi.c mod_client_add_filter.c mod_dav.c
mod_dav_fs.c mod_deflate.c mod_dir.c mod_disk_cache.c mod_dumpio.c
mod_eat_post.c mod_echo.c mod_echo_post.c mod_echo_post_chunk.c mod_env.c
mod_expires.c mod_ext_filter.c mod_filter.c mod_headers.c mod_ident.c
mod_imagemap.c mod_include.c mod_info.c mod_input_body_filter.c
mod_lbmethod_bybusyness.c mod_lbmethod_byrequests.c mod_lbmethod_bytraffic.c
mod_list_modules.c mod_log_config.c mod_log_forensic.c mod_logio.c mod_mime.c
mod_mime_magic.c mod_mpm_worker.c mod_negotiation.c mod_nntp_like.c mod_proxy.c
mod_proxy_ajp.c mod_proxy_balancer.c mod_proxy_connect.c mod_proxy_ftp.c
mod_proxy_http.c mod_random_chunk.c mod_rewrite.c mod_setenvif.c mod_so.c
mod_socache_shmcb.c mod_speling.c mod_ssl.c mod_status.c mod_test_apr_uri.c
mod_test_pass_brigade.c mod_test_rwrite.c mod_test_ssl.c mod_unique_id.c
mod_unixd.c mod_userdir.c mod_usertrack.c mod_version.c mod_vhost_alias.c
expect:
core.c http_core.c mod_access_compat.c mod_actions.c mod_alias.c mod_asis.c
mod_auth_basic.c mod_auth_digest.c mod_authany.c mod_authn_anon.c
mod_authn_core.c mod_authn_dbm.c mod_authn_file.c mod_authz_core.c
mod_authz_dbm.c mod_authz_groupfile.c mod_authz_host.c mod_authz_owner.c
mod_authz_user.c mod_autoindex.c mod_bucketeer.c mod_cache.c mod_case_filter.c
mod_case_filter_in.c mod_cern_meta.c mod_cgi.c mod_client_add_filter.c mod_dav.c
mod_dav_fs.c mod_deflate.c mod_dir.c mod_disk_cache.c mod_dumpio.c
mod_eat_post.c mod_echo.c mod_echo_post.c mod_echo_post_chunk.c mod_env.c
mod_expires.c mod_ext_filter.c mod_filter.c mod_headers.c mod_ident.c
mod_imagemap.c mod_include.c mod_info.c mod_input_body_filter.c
mod_lbmethod_bybusyness.c mod_lbmethod_byrequests.c mod_lbmethod_bytraffic.c
mod_list_modules.c mod_log_config.c mod_log_forensic.c mod_logio.c mod_mime.c
mod_mime_magic.c mod_negotiation.c mod_nntp_like.c mod_proxy.c mod_proxy_ajp.c
mod_proxy_balancer.c mod_proxy_connect.c mod_proxy_ftp.c mod_proxy_http.c
mod_random_chunk.c mod_rewrite.c mod_setenvif.c mod_so.c mod_socache_shmcb.c
mod_speling.c mod_ssl.c mod_status.c mod_test_apr_uri.c mod_test_pass_brigade.c
mod_test_rwrite.c mod_test_ssl.c mod_unique_id.c mod_unixd.c mod_userdir.c
mod_usertrack.c mod_version.c mod_vhost_alias.c worker.c
not ok 1
# Failed test 1 in t/modules/info.t at line 59
FAILED test 1
        Failed 1/1 tests, 0.00% okay


Regards

RĂ¼diger


Mime
View raw message