valgrind version 3 renames the --logfile command line option to --log-file...

This commit is contained in:
Daniel Stenberg 2005-08-24 10:49:57 +00:00
parent 6ba19692a3
commit 1e038c4bc6
3 changed files with 17 additions and 1 deletions

View File

@ -8,6 +8,11 @@
Daniel (24 August 2005) 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 - Fixed CA cert verification using GnuTLS with the default bundle, which
previously failed due to GnuTLS not allowing x509 v1 CA certs by default. previously failed due to GnuTLS not allowing x509 v1 CA certs by default.

View File

@ -19,6 +19,7 @@ This release includes the following changes:
This release includes the following bugfixes: This release includes the following bugfixes:
o test suite works with valgrind 3
o CA cert verification with GnuTLS builds o CA cert verification with GnuTLS builds
o handles expiry times in cookie files that go beyond 32 bits in size 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 o several client problems with files, such as doing -d @file when the file

View File

@ -90,6 +90,7 @@ my $memanalyze="./memanalyze.pl";
my $stunnel = checkcmd("stunnel"); my $stunnel = checkcmd("stunnel");
my $valgrind = checkcmd("valgrind"); my $valgrind = checkcmd("valgrind");
my $valgrind_logfile="--logfile";
my $start; my $start;
my $valgrind_tool; my $valgrind_tool;
@ -109,6 +110,15 @@ if($valgrind) {
$valgrind=0; $valgrind=0;
} }
close(C); 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"); my $gdb = checkcmd("gdb");
@ -1251,7 +1261,7 @@ sub singletest {
} }
if($valgrind) { 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"; $CMDLINE .= "$cmdargs >>$STDOUT 2>>$STDERR";