# HG changeset patch # User Sergey Kandaurov # Date 1476091509 -10800 # Node ID fbf731526f49e032ee139a89183c8dfc65dd9c34 # Parent 7cf9b3e849d2b82c3c8bdb5f654e88e0955b9d0d Tests: relaxed check for known dynamic modules. Permit an optional suffix within dynamic module file names. diff --git a/lib/Test/Nginx.pm b/lib/Test/Nginx.pm --- a/lib/Test/Nginx.pm +++ b/lib/Test/Nginx.pm @@ -197,16 +197,16 @@ sub has_module($) { my %modules = ( image_filter - => 'ngx_http_image_filter_module.so', - perl => 'ngx_http_perl_module.so', - xslt => 'ngx_http_xslt_filter_module.so', - mail => 'ngx_mail_module.so', - stream => 'ngx_stream_module.so', + => 'ngx_http_image_filter_module', + perl => 'ngx_http_perl_module', + xslt => 'ngx_http_xslt_filter_module', + mail => 'ngx_mail_module', + stream => 'ngx_stream_module', ); my $module = $modules{$feature}; if (defined $module && defined $ENV{TEST_NGINX_GLOBALS}) { - $re = qr/load_module\s+[^;]*\Q$module\E\s*;/; + $re = qr/load_module\s+[^;]*\Q$module\E[-\w]*\.so\s*;/; return 1 if $ENV{TEST_NGINX_GLOBALS} =~ $re; }