diff options
Diffstat (limited to 'tests/libtest/test1022.pl')
-rwxr-xr-x | tests/libtest/test1022.pl | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl index 60eee384..377808c7 100755 --- a/tests/libtest/test1022.pl +++ b/tests/libtest/test1022.pl @@ -12,7 +12,7 @@ my $what=$ARGV[2]; open(CURL, "$ARGV[1]") || die "Can't open curl --version list in $ARGV[1]\n"; $_ = <CURL>; chomp; -/libcurl\/([\.\d]+(-DEV)?)/; +/libcurl\/([\.\d]+((-DEV)|(-\d+))?)/; my $version = $1; close CURL; @@ -22,17 +22,26 @@ my $curlconfigversion; open(CURLCONFIG, "sh $ARGV[0] --$what|") || die "Can't get curl-config --$what list\n"; $_ = <CURLCONFIG>; chomp; +my $filever=$_; if ( $what eq "version" ) { - /^libcurl ([\.\d]+(-DEV)?)$/ ; - $curlconfigversion = $1; + if($filever =~ /^libcurl ([\.\d]+((-DEV)|(-\d+))?)$/) { + $curlconfigversion = $1; + } + else { + $curlconfigversion = "illegal value"; + } } -else { +else { # "vernum" case # Convert hex version to decimal for comparison's sake - /^(..)(..)(..)$/ ; - $curlconfigversion = hex($1) . "." . hex($2) . "." . hex($3); + if($filever =~ /^(..)(..)(..)$/) { + $curlconfigversion = hex($1) . "." . hex($2) . "." . hex($3); + } + else { + $curlconfigversion = "illegal value"; + } # Strip off the -DEV from the curl version if it's there - $version =~ s/-DEV$//; + $version =~ s/-\w*$//; } close CURLCONFIG; |