romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-05 05:46:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

runtests: allow a test to switch off memdebug

Browse source 
Test 3207 now uses this as its multi-threading is not fully memdebug
compliant.

Closes #19752
This commit is contained in:
Daniel Stenberg 2025-11-28 17:41:59 +01:00
parent 3896152843
commit 02aa75a8c2
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/tests/FILEFORMAT.md
View file

@ -586,7 +586,7 @@ command has been run.
If the variable name has no assignment, no `=`, then that variable is just
deleted.
### `<command [option="no-q/no-output/no-include/force-output/binary-trace"] [timeout="secs"][delay="secs"][type="perl/shell"]>`
### `<command [option="no-q/no-output/no-include/no-memdebug/force-output/binary-trace"] [timeout="secs"][delay="secs"][type="perl/shell"]>`
Command line to run.
If the command spans multiple lines, they are concatenated with a space added
@ -608,6 +608,9 @@ otherwise written to verify stdout.
Set `option="no-include"` to prevent the test script to slap on the
`--include` argument.
Set `option="no-memdebug"` to make the test run without the memdebug tracking
system. For tests that are incompatible - multi-threaded for example.
Set `option="no-q"` avoid using `-q` as the first argument in the curl command
line.

2
lib/memdebug.c
View file

@ -111,8 +111,6 @@ void curl_dbg_memdebug(const char *logname)
if(!curl_dbg_logfile) {
if(logname && *logname)
curl_dbg_logfile = CURLX_FOPEN_LOW(logname, FOPEN_WRITETEXT);
else
curl_dbg_logfile = stderr;
#ifdef MEMDEBUG_LOG_SYNC
/* Flush the log file after every line so the log is not lost in a crash */
if(curl_dbg_logfile)

2
tests/data/test3207
View file

@ -37,7 +37,7 @@ concurrent HTTPS GET using shared ssl session cache
lib%TESTNUMBER
</tool>
# provide URL and ca-cert
<command>
<command option="no-memdebug">
https://localhost:%HTTPSPORT/%TESTNUMBER %CERTDIR/certs/test-ca.crt
</command>
</client>

11
tests/runner.pm
View file

@ -840,6 +840,7 @@ sub singletest_run {
$tool = $tool_name . exe_ext('TOOL');
}
my $oldmemdebug;
my $disablevalgrind;
my $CMDLINE="";
my $cmdargs;
@ -1025,6 +1026,11 @@ sub singletest_run {
# timestamp starting of test command
$$testtimings{"timetoolini"} = Time::HiRes::time();
if($cmdhash{'option'} && ($cmdhash{'option'} =~ /no-memdebug/)) {
$oldmemdebug = $ENV{'CURL_MEMDEBUG'};
delete $ENV{'CURL_MEMDEBUG'};
}
# run the command line we built
if($torture) {
$cmdres = torture($CMDLINE,
@ -1048,6 +1054,11 @@ sub singletest_run {
($cmdres, $dumped_core) = normalize_cmdres(runclient("$CMDLINE"));
}
# restore contents
if($oldmemdebug) {
$ENV{'CURL_MEMDEBUG'} = $oldmemdebug;
}
# timestamp finishing of test command
$$testtimings{"timetoolend"} = Time::HiRes::time();

6
tests/runtests.pl
View file

@ -1763,8 +1763,10 @@ sub singletest_check {
if(! -f "$logdir/$MEMDUMP") {
my %cmdhash = getpartattr("client", "command");
my $cmdtype = $cmdhash{'type'} || "default";
logmsg "\n** ALERT! memory tracking with no output file?\n"
if($cmdtype ne "perl");
if($cmdhash{'option'} !~ /no-memdebug/) {
logmsg "\n** ALERT! memory tracking with no output file?\n"
if($cmdtype ne "perl");
}
$ok .= "-"; # problem with memory checking
}
else {