luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test1013.pl: require case match for features, order match for protos, fix issue

Browse Source 
Update the script for test 1013 and 1014 to require:

- case-sensitive match for the curl feature list.
  (Continue to allow case-difference for protocols. They've always been
  in uppercase within curl config.)

- matching order for the protocol list.
  (Continue to allow any order for features. autotools builds on
  platforms without `sort -f` need it. E.g. Old Linux CI)

Also:

- fix casing of the `gsasl` feature in `configure`, to match `curl -V`
  and cmake.

- delete obsolete comment.

Closes #14706
This commit is contained in:
Viktor Szakats 2024-08-28 11:01:26 +02:00
parent a5682d9cb9
commit 5b87b4edf9
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -4938,7 +4938,7 @@ if test "x$curl_psl_msg" = "xenabled"; then
fi fi
if test "x$curl_gsasl_msg" = "xenabled"; then if test "x$curl_gsasl_msg" = "xenabled"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES GSASL" SUPPORT_FEATURES="$SUPPORT_FEATURES gsasl"
fi fi
if test "x$enable_altsvc" = "xyes"; then if test "x$enable_altsvc" = "xyes"; then

13
tests/libtest/test1013.pl
View File

@ -37,14 +37,13 @@ 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 = $_ if ( /$what:/i );
} }
close CURL; close CURL;
$curl_protocols =~ s/\r//; $curl_protocols =~ s/\r//;
$curl_protocols =~ /\w+: (.*)$/; $curl_protocols =~ /\w+: (.*)$/;
@curl = split / /,$1; @curl = split / /,$1;
@curl = sort @curl;
# Read the output of curl-config # Read the output of curl-config
my @curl_config; my @curl_config;
@ -52,12 +51,16 @@ open(CURLCONFIG, "sh $ARGV[0] --$what|") || die "Can't get curl-config $what lis
while( <CURLCONFIG> ) while( <CURLCONFIG> )
{ {
chomp; chomp;
# ignore curl-config --features not in curl's feature list $_ = lc($_) if($what eq "protocols"); # accept uppercase protocols in curl-config
push @curl_config, lc($_); push @curl_config, $_;
} }
close CURLCONFIG; close CURLCONFIG;
@curl_config = sort @curl_config; # allow order mismatch to handle autotools builds with no 'sort -f' available
if($what eq "features") {
@curl = sort @curl;
@curl_config = sort @curl_config;
}
my $curlproto = join ' ', @curl; my $curlproto = join ' ', @curl;
my $curlconfigproto = join ' ', @curl_config; my $curlconfigproto = join ' ', @curl_config;