From 1e038c4bc6ecc43bdbbe0e66a70001c7fe967bf6 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 24 Aug 2005 10:49:57 +0000
Subject: valgrind version 3 renames the --logfile command line option to
 --log-file...

---
 CHANGES           |  5 +++++
 RELEASE-NOTES     |  1 +
 tests/runtests.pl | 12 +++++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 1df565976..003d4f872 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,11 @@
 
 
 Daniel (24 August 2005)
+- (Trying hard to exclude emotions now.) valgrind version 3 suddenly renamed
+  the --logfile command line option to --log-file, and thus the test script
+  valgrind autodetection now has yet another version check to do and then it
+  alters the valgrind command line accordingly.
+
 - Fixed CA cert verification using GnuTLS with the default bundle, which
   previously failed due to GnuTLS not allowing x509 v1 CA certs by default.     
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 213e561c0..d15c97436 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -19,6 +19,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o test suite works with valgrind 3
  o CA cert verification with GnuTLS builds
  o handles expiry times in cookie files that go beyond 32 bits in size
  o several client problems with files, such as doing -d @file when the file
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 939aa80e7..525d62c50 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -90,6 +90,7 @@ my $memanalyze="./memanalyze.pl";
 
 my $stunnel = checkcmd("stunnel");
 my $valgrind = checkcmd("valgrind");
+my $valgrind_logfile="--logfile";
 my $start;
 
 my $valgrind_tool;
@@ -109,6 +110,15 @@ if($valgrind) {
         $valgrind=0;
     }
     close(C);
+
+    # valgrind 3 renamed the --logfile option to --log-file!!!
+    my $ver=`valgrind --version`;
+    # cut off all but digits and dots
+    $ver =~ s/[^0-9.]//g;
+
+    if($ver >= 3) {
+        $valgrind_logfile="--log-file";
+    }
 }
 
 my $gdb = checkcmd("gdb");
@@ -1251,7 +1261,7 @@ sub singletest {
     }
 
     if($valgrind) {
-        $CMDLINE = "valgrind ".$valgrind_tool."--leak-check=yes --num-callers=16 --logfile=log/valgrind$testnum $CMDLINE";
+        $CMDLINE = "valgrind ".$valgrind_tool."--leak-check=yes --num-callers=16 ${valgrind_logfile}=log/valgrind$testnum $CMDLINE";
     }
 
     $CMDLINE .= "$cmdargs >>$STDOUT 2>>$STDERR";
-- 
cgit v1.2.3