generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added test case 1014 to compare curl-config --features with curl --version

Browse Source
This commit is contained in:
Dan Fandrich 2007-11-01 03:09:27 +00:00
parent 16897354bc
commit 6f33531861
5 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -10,8 +10,8 @@ Dan F (31 October 2007)
- Fixed the output of curl-config --protocols which showed SCP and SFTP
always, except when --without-libssh2 was given
- Added test case 1013 to check that curl-config --protocols matches the
protocols listed in curl --version
- Added test cases 1013 and 1014 to check that curl-config --protocols and
curl-config --features matches the output of curl --version
Dan F (30 October 2007)
- Fixed an OOM problem with file: URLs

2
tests/data/Makefile.am
View File

@ -46,7 +46,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
test231 test1000 test1001 test1002 test1003 test1004 test1005 test1006 \
test615 test1007 test541 test1010 test1011 test1012 test542 test543 \
test536 test1008 test1009 test2000 test2001 test2002 test2003 test35 \
test544 test545 test2004 test546 test1013
test544 test545 test2004 test546 test1013 test1014
filecheck:
@mkdir test-place; \

4
tests/data/test1013
View File

@ -11,13 +11,13 @@
none
</server>
<name>
Compare curl --version with curl-config --features
Compare curl --version with curl-config --protocols
</name>
<command>
--version
</command>
<postcheck>
%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1013
%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1013 protocols
</postcheck>
</client>

31
tests/data/test1014 Normal file
View File

@ -0,0 +1,31 @@
<testcase>
#
# Server-side
<reply>
</reply>
#
# Client-side
<client>
<server>
none
</server>
<name>
Compare curl --version with curl-config --features
</name>
<command>
--version
</command>
<postcheck>
%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1014 features
</postcheck>
</client>
#
# Verify data after the test has been "shot"
<verify>
<errorcode>
2
</errorcode>
</verify>
</testcase>

17
tests/libtest/test1013.pl
View File

@ -1,25 +1,28 @@
#!/usr/bin/env perl
# Determine if curl-config --protocols matches the curl --version protocols
if ( $#ARGV != 1 )
if ( $#ARGV != 2 )
{
print "Usage: $0 curl-config-script curl-features-file\n";
print "Usage: $0 curl-config-script curl-features-file features|protocols\n";
exit 3;
}
my $what=$ARGV[2];
my $curl_protocols="";
open(CURL, "@ARGV[1]") || die "Can't get curl protocols list\n";
open(CURL, "@ARGV[1]") || die "Can't get curl $what list\n";
while( <CURL> )
{
$curl_protocols = $_ if ( /Protocols:/ );
$curl_protocols = lc($_) if ( /$what:/i );
}
close CURL;
$curl_protocols =~ /Protocols: (.*)$/;
$curl_protocols =~ /\w+: (.*)$/;
@curl = split / /,$1;
@curl = grep(!/^Debug|Largefile$/i, @curl);
@curl = sort @curl;
my @curl_config;
open(CURLCONFIG, "sh @ARGV[0] --protocols|") || die "Can't get curl-config protocols list\n";
open(CURLCONFIG, "sh @ARGV[0] --$what|") || die "Can't get curl-config $what list\n";
while( <CURLCONFIG> )
{
chomp;
@ -34,7 +37,7 @@ my $curlconfigproto = join ' ', @curl_config;
my $different = $curlproto ne $curlconfigproto;
if ($different) {
print "Mismatch in protocol lists:\n";
print "Mismatch in $what lists:\n";
print "curl: $curlproto\n";
print "curl-config: $curlconfigproto\n";
}