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

runtests: simplify value returned regarding use of valgrind

Browse source 
As a side effect this will now also show in verbose mode that valgrind
is being skipped on tests that explicitly disable it, such as 600.

Ref: #10818
This commit is contained in:
Dan Fandrich 2023-04-18 13:53:30 -07:00
parent 4a41745e21
commit 6210bc0111
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/runner.pm
View file

@ -37,7 +37,6 @@ BEGIN {
restore_test_env
runner_test_preprocess
runner_test_run
use_valgrind
checktestcmd
$DBGCURL
$gdbthis
@ -762,7 +761,7 @@ sub singletest_run {
# timestamp finishing of test command
$timetoolend{$testnum} = Time::HiRes::time();
return (0, $cmdres, $dumped_core, $CURLOUT, $tool, $disablevalgrind);
return (0, $cmdres, $dumped_core, $CURLOUT, $tool, use_valgrind() && !$disablevalgrind);
}
@ -933,8 +932,8 @@ sub runner_test_run {
my $dumped_core;
my $CURLOUT;
my $tool;
my $disablevalgrind;
($error, $cmdres, $dumped_core, $CURLOUT, $tool, $disablevalgrind) = singletest_run($testnum);
my $usedvalgrind;
($error, $cmdres, $dumped_core, $CURLOUT, $tool, $usedvalgrind) = singletest_run($testnum);
if($error) {
return -2;
}
@ -957,7 +956,7 @@ sub runner_test_run {
# restore environment variables that were modified
restore_test_env(0);
return (0, $cmdres, $CURLOUT, $tool, $disablevalgrind);
return (0, $cmdres, $CURLOUT, $tool, $usedvalgrind);
}
1;