Revert "Update to 7.40.1"

[platform/upstream/curl.git] / tests / libtest / test1013.pl

diff --git a/tests/libtest/test1013.pl b/tests/libtest/test1013.pl
index 6c5a5dc..37f98d7 100755 (executable)
--- a/tests/libtest/test1013.pl
+++ b/tests/libtest/test1013.pl
@@ -1,32 +1,41 @@
 #!/usr/bin/env perl
-# Determine if curl-config --protocols matches the curl --version protocols
-if ( $#ARGV != 2 ) 
+# Determine if curl-config --protocols/--features matches the
+# curl --version protocols/features
+if ( $#ARGV != 2 )
 {
-       print "Usage: $0 curl-config-script curl-features-file features|protocols\n";
-       exit 3;
+    print "Usage: $0 curl-config-script curl-version-output-file features|protocols\n";
+    exit 3;
 }
 
 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 );
 }
 close CURL;
 
+$curl_protocols =~ s/\r//;
 $curl_protocols =~ /\w+: (.*)$/;
 @curl = split / /,$1;
-@curl = grep(!/^Debug|Largefile$/i, @curl);
+
+# These features are not supported by curl-config
+@curl = grep(!/^(Debug|TrackMemory|Metalink|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;
-    push @curl_config, lc($_);
+    # ignore curl-config --features not in curl's feature list
+    if(!/^(GSS-API)$/) {
+        push @curl_config, lc($_);
+    }
 }
 close CURLCONFIG;
 
@@ -37,8 +46,8 @@ my $curlconfigproto = join ' ', @curl_config;
 
 my $different = $curlproto ne $curlconfigproto;
 if ($different) {
-       print "Mismatch in $what lists:\n";
-       print "curl:        $curlproto\n";
-       print "curl-config: $curlconfigproto\n";
+    print "Mismatch in $what lists:\n";
+    print "curl:        $curlproto\n";
+    print "curl-config: $curlconfigproto\n";
 }
 exit $different;