romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-03 08:00:34 +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

12
tests/runtests.pl
View file

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