Commit 2f3d5205 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Ignore more features that curl-config is not expected to know about

parent 48dd0c56

tests/libtest/test1013.pl

+7 −3
Original line number Original line Diff line number Diff line
@@ -8,8 +8,9 @@ if ( $#ARGV != 2 ) 




my $what=$ARGV[2];

my $what=$ARGV[2];





# Read the output of curl --version

my $curl_protocols="";

my $curl_protocols="";

open(CURL, "@ARGV[1]") || die "Can't get curl $what list\n";

open(CURL, "$ARGV[1]") || die "Can't get curl $what list\n";

while( <CURL> )

while( <CURL> )

{

{

    $curl_protocols = lc($_) if ( /$what:/i );

    $curl_protocols = lc($_) if ( /$what:/i );
@@ -18,11 +19,14 @@ close CURL; 




$curl_protocols =~ /\w+: (.*)$/;

$curl_protocols =~ /\w+: (.*)$/;

@curl = split / /,$1;

@curl = split / /,$1;

@curl = grep(!/^Debug|Largefile$/i, @curl);



# These features are not supported by curl-config

@curl = grep(!/^(Debug|Largefile|CharConv|GSS-Negotiate|SPNEGO)$/i, @curl);

@curl = sort @curl;

@curl = sort @curl;





# Read the output of curl-config

my @curl_config;

my @curl_config;

open(CURLCONFIG, "sh @ARGV[0] --$what|") || die "Can't get curl-config $what list\n";

open(CURLCONFIG, "sh $ARGV[0] --$what|") || die "Can't get curl-config $what list\n";

while( <CURLCONFIG> )

while( <CURLCONFIG> )

{

{

    chomp;

    chomp;