generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/runtests.pl
View File

@@ -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";