summaryrefslogtreecommitdiff
path: root/tests/libtest/test1022.pl
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-01-08 19:38:57 +0100
committerng0 <ng0@infotropique.org>2017-08-20 18:40:22 +0000
commit83c97b19e714790ceebc107dd8e6d4b349409d1c (patch)
treef6f9ff2babb15ab1ad8e0ab84f43527f3c8356f7 /tests/libtest/test1022.pl
parent8839c05fba1f8415eec17eff8ac60cc3a50eb51e (diff)
downloadgnurl-7_55_1.tar.gz
gnurl-7_55_1.tar.bz2
gnurl-7_55_1.zip
Patchset for gnURL microfork:gnurl-7.55.1gnurl-7_55_1
* Patches to rename libcurl to libgnurl by Christian * Updated for latest curl using git cherry-pick by Jeff, Florian, ng0 * Patches to fix the testsuite (deleted tests/data/test1139, renamed reference from libcurl.* to libgnurl.*) by ng0 * Added guix-gnurl.scm which can be used to build this with guix prior to installing it. (author: ng0) * Further adjustments by ng0 * 7.55.0: Manual addition of a7bbbb7c368c6096802007f61f19a02e9d75285b and f864bd8c880d5a916379aa4f26f1c45fe370b282 from upstream master. * 7.55.1: Renamed include/curl to include/gnurl, a partial fix of https://gnunet.org/bugs/view.php?id=5122 Signed-off-by: ng0 <ng0@infotropique.org>
Diffstat (limited to 'tests/libtest/test1022.pl')
-rwxr-xr-xtests/libtest/test1022.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl
index 377808c73..df088c314 100755
--- a/tests/libtest/test1022.pl
+++ b/tests/libtest/test1022.pl
@@ -12,6 +12,8 @@ my $what=$ARGV[2];
open(CURL, "$ARGV[1]") || die "Can't open curl --version list in $ARGV[1]\n";
$_ = <CURL>;
chomp;
+# Leave the version to contain libcurl here as we use the ../src/curl binary and
+# it is producting "libcurl" string
/libcurl\/([\.\d]+((-DEV)|(-\d+))?)/;
my $version = $1;
close CURL;
@@ -24,7 +26,7 @@ $_ = <CURLCONFIG>;
chomp;
my $filever=$_;
if ( $what eq "version" ) {
- if($filever =~ /^libcurl ([\.\d]+((-DEV)|(-\d+))?)$/) {
+ if($filever =~ /^libgnurl ([\.\d]+((-DEV)|(-\d+))?)$/) {
$curlconfigversion = $1;
}
else {