moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

curl-config: fix --version

Browse Source 
curl-config --version didn't output the correct version string (bug
introduced in commit 0355e33b5f), and unfortunately the test
case 1022 that was supposed to check for this was broken.

This change fixes the test to detect this problem and it fixes the
output.

Bug: http://curl.haxx.se/bug/view.cgi?id=3288727
This commit is contained in:
Daniel Stenberg 2011-04-18 09:03:12 +02:00
parent 84f809e7a8
commit 82ecc85d9e
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
curl-config.in
View File

@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 2001 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 2001 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@ -94,7 +94,7 @@ while test $# -gt 0; do
;;
--version)
echo libcurl @VERSION@
echo libcurl @CURLVERSION@
exit 0
;;

17
tests/libtest/test1022.pl
View File

@ -22,14 +22,23 @@ 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)?)$/) {
$curlconfigversion = $1;
}
else {
$curlconfigversion = "illegal value";
}
}
else {
# 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$//;