Mercurial > hg > nginx-tests

diff image_filter.t @ 971:ed99be008b52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
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);