moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 00:58:48 -05:00
Code Issues Releases Wiki Activity

tests: provide 'manual' as a feature to optionally require

Browse Source 
... and make test 1026 rely on that feature so that --disable-manual
builds don't cause test failures.

Reported-by: Max Dymond and Anders Roxell
Fixes #2533
Closes #2540
This commit is contained in:
Daniel Stenberg 2018-04-29 00:24:49 +02:00
parent f84139fd08
commit c39ed80526
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/FILEFORMAT
View File

@ -231,6 +231,7 @@ ipv6
Kerberos Kerberos
large_file large_file
libz libz
manual
Metalink Metalink
NSS NSS
NTLM NTLM

3
tests/data/test1026
View File

@ -13,6 +13,9 @@
# #
# Client-side # Client-side
<client> <client>
<features>
manual
</features>
<server> <server>
none none
</server> </server>

17
tests/runtests.pl
View File

@ -235,6 +235,7 @@ my $has_threadedres;# set if built with threaded resolver
my $has_psl; # set if libcurl is built with PSL support my $has_psl; # set if libcurl is built with PSL support
my $has_ldpreload; # set if curl is built for systems supporting LD_PRELOAD my $has_ldpreload; # set if curl is built for systems supporting LD_PRELOAD
my $has_multissl; # set if curl is build with MultiSSL support my $has_multissl; # set if curl is build with MultiSSL support
my $has_manual; # set if curl is built with built-in manual
# this version is decided by the particular nghttp2 library that is being used # this version is decided by the particular nghttp2 library that is being used
my $h2cver = "h2c"; my $h2cver = "h2c";
@ -3033,6 +3034,17 @@ sub checksystem {
"TrackMemory feature (--enable-curldebug)"; "TrackMemory feature (--enable-curldebug)";
} }
open(M, "$CURL -M 2>&1|");
while(my $s = <M>) {
if($s =~ /built-in manual was disabled at build-time/) {
$has_manual = 0;
last;
}
$has_manual = 1;
last;
}
close(M);
$has_shared = `sh $CURLCONFIG --built-shared`; $has_shared = `sh $CURLCONFIG --built-shared`;
chomp $has_shared; chomp $has_shared;
@ -3472,6 +3484,11 @@ sub singletest {
next; next;
} }
} }
elsif($1 eq "manual") {
if($has_manual) {
next;
}
}
elsif($1 eq "socks") { elsif($1 eq "socks") {
next; next;
} }