]> granicus.if.org Git - curl/commitdiff
Ignore more features that curl-config is not expected to know about
authorDan Fandrich <dan@coneharvesters.com>
Thu, 1 Nov 2007 21:20:24 +0000 (21:20 +0000)
committerDan Fandrich <dan@coneharvesters.com>
Thu, 1 Nov 2007 21:20:24 +0000 (21:20 +0000)
tests/libtest/test1013.pl

index 6c5a5dcdcbb46ea79313f29ea5ee1224b04b67e1..b46e5ae3a1794dce67807d8b534944d94f808a48 100755 (executable)
@@ -8,8 +8,9 @@ if ( $#ARGV != 2 )
 
 my $what=$ARGV[2];
 
+# Read the output of curl --version
 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> )
 {
     $curl_protocols = lc($_) if ( /$what:/i );
@@ -18,11 +19,14 @@ close CURL;
 
 $curl_protocols =~ /\w+: (.*)$/;
 @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;
 
+# Read the output of 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> )
 {
     chomp;