curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-06 20:34:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

tests: fail torture if !valgrind&threaded resolver

Browse Source 
We don't check the memory debug output with the threaded resolver, so
the only way to do it with with valgrind.

Also move the disabling of memory tracking to where we log that we're
doing it.

Closes #17501
This commit is contained in:
Yedaya Katsman 2025-06-07 21:44:35 +03:00 committed by Daniel Stenberg
parent bc7d88cc8a
commit 05ffeeda0c
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/runtests.pl
View File

@ -834,9 +834,16 @@ sub checksystemfeatures {
chomp $has_shared;
$has_shared = $has_shared eq "yes";
if(!$feature{"TrackMemory"} && $torture) {
die "can't run torture tests since curl was built without ".
"TrackMemory feature (--enable-curldebug)";
if($torture) {
if(!$feature{"TrackMemory"}) {
die "can't run torture tests since curl was built without ".
"TrackMemory feature (--enable-curldebug)";
}
if ($feature{"threaded-resolver"} && !$valgrind) {
die "can't run torture tests since curl was built with the ".
"threaded resolver, and we aren't running with valgrind";
}
}
my $hostname=join(' ', runclientoutput("hostname"));
@ -871,10 +878,12 @@ sub checksystemfeatures {
# Only show if not the default for now
logmsg "* Jobs: $jobs\n";
}
# Disable memory tracking when using threaded resolver
if($feature{"TrackMemory"} && $feature{"threaded-resolver"}) {
logmsg("*\n",
"*** DISABLES TrackMemory (memory tracking) when using threaded resolver\n",
"*\n");
$feature{"TrackMemory"} = 0;
}
logmsg sprintf("* Env: %s%s%s%s%s", $valgrind?"Valgrind ":"",
@ -884,10 +893,6 @@ sub checksystemfeatures {
$nghttpx_h3);
logmsg sprintf("%s\n", $libtool?"Libtool ":"");
logmsg ("* Seed: $randseed\n");
# Disable memory tracking when using threaded resolver
$feature{"TrackMemory"} = $feature{"TrackMemory"} && !$feature{"threaded-resolver"};
}
#######################################################################