From 43b876d7dfbd1317ea91a8e3126c60e4c550b047 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Fri, 14 Apr 2023 16:11:58 -0700
Subject: runtests: assume a newer Valgrind by default

The tests for an older Valgrind version should probably just be deleted,
given that they're testing for an 18-year-old version.
---
 tests/runner.pm   |  4 ++--
 tests/runtests.pl | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/runner.pm b/tests/runner.pm
index 7e7f94664..5d6aba366 100644
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -64,8 +64,8 @@ use globalconfig;
 #######################################################################
 # Global variables set elsewhere but used only by this package
 our $DBGCURL=$CURL; #"../src/.libs/curl";  # alternative for debugging
-our $valgrind_logfile="--logfile";  # the option name for valgrind 2.X
-our $valgrind_tool;
+our $valgrind_logfile="--log-file";  # the option name for valgrind >=3
+our $valgrind_tool="--tool=memcheck";
 our $gdb = checktestcmd("gdb");
 our $gdbthis;      # run test case with gdb debugger
 our $gdbxwin;      # use windowed gdb when using gdb
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 1e5ddb1e0..9dc9eb134 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -2329,9 +2329,11 @@ if($valgrind) {
 
         # since valgrind 2.1.x, '--tool' option is mandatory
         # use it, if it is supported by the version installed on the system
+        # (this happened in 2003, so we could probably don't need to care about
+        # that old version any longer and just delete this check)
         runclient("valgrind --help 2>&1 | grep -- --tool > /dev/null 2>&1");
-        if (($? >> 8)==0) {
-            $valgrind_tool="--tool=memcheck";
+        if (($? >> 8)) {
+            $valgrind_tool="";
         }
         open(my $curlh, "<", "$CURL");
         my $l = <$curlh>;
@@ -2342,14 +2344,16 @@ if($valgrind) {
         close($curlh);
 
         # valgrind 3 renamed the --logfile option to --log-file!!!
+        # (this happened in 2005, so we could probably don't need to care about
+        # that old version any longer and just delete this check)
         my $ver=join(' ', runclientoutput("valgrind --version"));
         # cut off all but digits and dots
         $ver =~ s/[^0-9.]//g;
 
         if($ver =~ /^(\d+)/) {
             $ver = $1;
-            if($ver >= 3) {
-                $valgrind_logfile="--log-file";
+            if($ver < 3) {
+                $valgrind_logfile="--logfile";
             }
         }
     }
-- 
cgit v1.2.1