]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
runtests: fix the disabling of the memory tracking
authorDaniel Stenberg <daniel@haxx.se>
Thu, 6 Feb 2025 21:51:56 +0000 (22:51 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Thu, 6 Feb 2025 22:14:34 +0000 (23:14 +0100)
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

tests/runtests.pl

index 0ca69fec4c8acb5f56f9940d729b0bc050f8fd19..2d8945583e66387c77b974547183aa32fc293cd4 100755 (executable)
@@ -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