Mercurial > hg > nginx-tests
comparison image_filter.t @ 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 | e9064d691790 |
| children | 882267679006 |
comparison
equal
deleted
inserted
replaced
| 970:c227348453db | 971:ed99be008b52 |
|---|---|
| 277 } | 277 } |
| 278 | 278 |
| 279 sub has_gdversion { | 279 sub has_gdversion { |
| 280 my ($need) = @_; | 280 my ($need) = @_; |
| 281 | 281 |
| 282 my $v_str = `gdlib-config --version 2>&1` or return; | 282 my $v_str = `gdlib-config --version 2>&1` or return 1; |
| 283 ($v_str) = $v_str =~ m!([0-9a-z.]+)!; | 283 ($v_str) = $v_str =~ m!^([0-9.]+)! or return 1; |
| 284 my @v = split(/\./, $v_str); | 284 my @v = split(/\./, $v_str); |
| 285 my ($n, $v); | 285 my ($n, $v); |
| 286 | 286 |
| 287 for $n (split(/\./, $need)) { | 287 for $n (split(/\./, $need)) { |
| 288 $v = shift @v || 0; | 288 $v = shift @v || 0; |