diff options
Diffstat (limited to 'tests/runtests.pl')
| -rwxr-xr-x | tests/runtests.pl | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl index d6aa5cac..054c64bf 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -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_ldpreload; # set if curl is built for systems supporting LD_PRELOAD 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 my $h2cver = "h2c"; @@ -3033,6 +3034,17 @@ sub checksystem { "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`; chomp $has_shared; @@ -3472,6 +3484,11 @@ sub singletest { next; } } + elsif($1 eq "manual") { + if($has_manual) { + next; + } + } elsif($1 eq "socks") { next; } @@ -3909,7 +3926,8 @@ sub singletest { if((!$cmdhash{'option'}) || ($cmdhash{'option'} !~ /no-output/)) { #We may slap on --output! - if (!@validstdout) { + if (!@validstdout || + ($cmdhash{'option'} && $cmdhash{'option'} =~ /force-output/)) { $out=" --output $CURLOUT "; } } |