curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-16 00:52:42 +03:00
Code Issues Packages Projects Releases 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
Show Stats 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 restore_test_env
runner_test_preprocess runner_test_preprocess
runner_test_run runner_test_run
use_valgrind
checktestcmd checktestcmd
$DBGCURL $DBGCURL
$gdbthis $gdbthis
@ -762,7 +761,7 @@ sub singletest_run {
# timestamp finishing of test command # timestamp finishing of test command
$timetoolend{$testnum} = Time::HiRes::time(); $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 $dumped_core;
my $CURLOUT; my $CURLOUT;
my $tool; my $tool;
my $disablevalgrind; my $usedvalgrind;
($error, $cmdres, $dumped_core, $CURLOUT, $tool, $disablevalgrind) = singletest_run($testnum); ($error, $cmdres, $dumped_core, $CURLOUT, $tool, $usedvalgrind) = singletest_run($testnum);
if($error) { if($error) {
return -2; return -2;
} }
@ -957,7 +956,7 @@ sub runner_test_run {
# restore environment variables that were modified # restore environment variables that were modified
restore_test_env(0); restore_test_env(0);
return (0, $cmdres, $CURLOUT, $tool, $disablevalgrind); return (0, $cmdres, $CURLOUT, $tool, $usedvalgrind);
} }
1; 1;

12
tests/runtests.pl
View File

@ -1014,7 +1014,7 @@ sub singletest_count {
####################################################################### #######################################################################
# Verify test succeeded # Verify test succeeded
sub singletest_check { sub singletest_check {
my ($testnum, $cmdres, $CURLOUT, $tool, $disablevalgrind)=@_; my ($testnum, $cmdres, $CURLOUT, $tool, $usedvalgrind)=@_;
# Skip all the verification on torture tests # Skip all the verification on torture tests
if ($torture) { if ($torture) {
@ -1462,7 +1462,7 @@ sub singletest_check {
} }
if($valgrind) { if($valgrind) {
if(use_valgrind() && !$disablevalgrind) { if($usedvalgrind) {
if(!opendir(DIR, "$LOGDIR")) { if(!opendir(DIR, "$LOGDIR")) {
logmsg "ERROR: unable to read $LOGDIR\n"; logmsg "ERROR: unable to read $LOGDIR\n";
# timestamp test result verification end # timestamp test result verification end
@ -1500,7 +1500,7 @@ sub singletest_check {
$ok .= "v"; $ok .= "v";
} }
else { else {
if($verbose && !$disablevalgrind) { if($verbose) {
logmsg " valgrind SKIPPED\n"; logmsg " valgrind SKIPPED\n";
} }
$ok .= "-"; # skipped $ok .= "-"; # skipped
@ -1594,8 +1594,8 @@ sub singletest {
my $cmdres; my $cmdres;
my $CURLOUT; my $CURLOUT;
my $tool; my $tool;
my $disablevalgrind; my $usedvalgrind;
($error, $cmdres, $CURLOUT, $tool, $disablevalgrind) = runner_test_run($testnum); ($error, $cmdres, $CURLOUT, $tool, $usedvalgrind) = runner_test_run($testnum);
if($error == -1) { if($error == -1) {
# return a test failure, either to be reported or to be ignored # return a test failure, either to be reported or to be ignored
return $errorreturncode; return $errorreturncode;
@ -1610,7 +1610,7 @@ sub singletest {
####################################################################### #######################################################################
# Verify that the test succeeded # Verify that the test succeeded
$error = singletest_check($testnum, $cmdres, $CURLOUT, $tool, $disablevalgrind); $error = singletest_check($testnum, $cmdres, $CURLOUT, $tool, $usedvalgrind);
if($error == -1) { if($error == -1) {
# return a test failure, either to be reported or to be ignored # return a test failure, either to be reported or to be ignored
return $errorreturncode; return $errorreturncode;