From: Daniel Stenberg Date: Thu, 6 Feb 2025 21:51:56 +0000 (+0100) Subject: runtests: fix the disabling of the memory tracking X-Git-Tag: curl-8_12_1~68 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcd5c2baffff95b858b43bfbc3d03dac2ef1b5ce;p=thirdparty%2Fcurl.git runtests: fix the disabling of the memory tracking It should be done if "threaded-resolver" is enabled, but the detection was slightly broken for builds that add c-ares for the asyn-rr feature. Closes #16226 --- diff --git a/tests/runtests.pl b/tests/runtests.pl index 0ca69fec4c..2d8945583e 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -670,11 +670,15 @@ sub checksystemfeatures { $feature{"alt-svc"} = $feat =~ /alt-svc/i; # HSTS support $feature{"HSTS"} = $feat =~ /HSTS/i; + $feature{"asyn-rr"} = $feat =~ /asyn-rr/; if($feat =~ /AsynchDNS/i) { - if(!$feature{"c-ares"}) { + if(!$feature{"c-ares"} || $feature{"asyn-rr"}) { # this means threaded resolver $feature{"threaded-resolver"} = 1; $resolver="threaded"; + + # does not count as "real" c-ares + $feature{"c-ares"} = 0; } } # http2 enabled @@ -698,7 +702,6 @@ sub checksystemfeatures { # Thread-safe init $feature{"threadsafe"} = $feat =~ /threadsafe/i; $feature{"HTTPSRR"} = $feat =~ /HTTPSRR/; - $feature{"asyn-rr"} = $feat =~ /asyn-rr/; } # # Test harness currently uses a non-stunnel server in order to