Mercurial > hg > nginx-tests
changeset 1053:fbf731526f49
Tests: relaxed check for known dynamic modules.
Permit an optional suffix within dynamic module file names.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Mon, 10 Oct 2016 12:25:09 +0300 |
parents | 7cf9b3e849d2 |
children | 9b8e13e2ee67 |
files | lib/Test/Nginx.pm |
diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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; }