From: Viktor Szakats <commit@vsz.me>
Date: Tue, 11 Feb 2025 00:38:11 +0000 (+0100)
Subject: runtests.pl: reapply accidental revert
X-Git-Tag: curl-8_12_1~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e156c7f8ee8d1ddd0dc60d76bb37c2ed8abc1978;p=thirdparty%2Fcurl.git

runtests.pl: reapply accidental revert

Reapply an accidental, and unrelated, change committed in
3c128966edc86c89de85f72671f9f627c984af53 which unwantedly reverted
the preceding commit fcd5c2baffff95b858b43bfbc3d03dac2ef1b5ce.

Caused by doing a local rebase when `git am` did not apply cleanly,
and most likely using a local base behind master.
---

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 35c1b12149..d647293555 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