Mercurial > hg > nginx-tests
changeset 971:ed99be008b52
Tests: adjusted libgd version check for recent versions.
The "libgd-config" binary is deprecated in recent versions and may not exist
or have unexpected output.
| author | Sergey Kandaurov <pluknet@nginx.com> |
|---|---|
| date | Mon, 11 Jul 2016 14:41:19 +0300 |
| parents | c227348453db |
| children | 313e3f1905d4 |
| files | image_filter.t |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/image_filter.t +++ b/image_filter.t @@ -279,8 +279,8 @@ sub http_get_body { sub has_gdversion { my ($need) = @_; - my $v_str = `gdlib-config --version 2>&1` or return; - ($v_str) = $v_str =~ m!([0-9a-z.]+)!; + my $v_str = `gdlib-config --version 2>&1` or return 1; + ($v_str) = $v_str =~ m!^([0-9.]+)! or return 1; my @v = split(/\./, $v_str); my ($n, $v);