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 6127df8..b680273 100755 (executable)
--- a/tests/libtest/test1013.pl
+++ b/tests/libtest/test1013.pl
@@ -1,10 +1,10 @@
 #!/usr/bin/env perl
 # Determine if curl-config --protocols/--features matches the
 # curl --version protocols/features
-if ( $#ARGV != 2 ) 
+if ( $#ARGV != 2 )
 {
-       print "Usage: $0 curl-config-script curl-version-output-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];
@@ -18,11 +18,12 @@ while( <CURL> )
 }
 close CURL;
 
+$curl_protocols =~ s/\r//;
 $curl_protocols =~ /\w+: (.*)$/;
 @curl = split / /,$1;
 
 # These features are not supported by curl-config
-@curl = grep(!/^(Debug|Largefile|CharConv|GSS-Negotiate|SPNEGO)$/i, @curl);
+@curl = grep(!/^(Debug|TrackMemory|Metalink|Largefile|CharConv)$/i, @curl);
 @curl = sort @curl;
 
 # Read the output of curl-config
@@ -31,6 +32,7 @@ open(CURLCONFIG, "sh $ARGV[0] --$what|") || die "Can't get curl-config $what lis
 while( <CURLCONFIG> )
 {
     chomp;
+    # ignore curl-config --features not in curl's feature list
     push @curl_config, lc($_);
 }
 close CURLCONFIG;
@@ -42,8 +44,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;