runtests: simplify value returned regarding use of valgrind

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

2 files changed, 10 insertions, 11 deletions

diff --git a/tests/runner.pm b/tests/runner.pm
index c788a514e..5542714b7 100644
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -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;
diff --git a/tests/runtests.pl b/tests/runtests.pl
index e652b968e..510695747 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -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;