moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 16:18:48 -05:00
Code Issues Releases Wiki Activity

When valgrind is disabled in the test file, don't run it at all (as opposed

Browse Source 
to running it and ignoring its output).
This commit is contained in:
Dan Fandrich 2007-10-25 19:39:52 +00:00
parent 26c1c8b2ad
commit b7dd186d36
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/runtests.pl
View File

@ -1746,7 +1746,8 @@ sub singletest {
$DBGCURL=$CMDLINE; $DBGCURL=$CMDLINE;
} }
if($valgrind) { my $usevalgrind = $valgrind && ((getpart("verify", "valgrind"))[0] !~ /disable/);
if($usevalgrind) {
$CMDLINE = "$valgrind ".$valgrind_tool."--leak-check=yes --num-callers=16 ${valgrind_logfile}=log/valgrind$testnum $CMDLINE"; $CMDLINE = "$valgrind ".$valgrind_tool."--leak-check=yes --num-callers=16 ${valgrind_logfile}=log/valgrind$testnum $CMDLINE";
} }
@ -2091,9 +2092,7 @@ sub singletest {
if($valgrind) { if($valgrind) {
# this is the valid protocol blurb curl should generate # this is the valid protocol blurb curl should generate
my @disable= getpart("verify", "valgrind"); if($usevalgrind) {
if($disable[0] !~ /disable/) {
opendir(DIR, "log") || opendir(DIR, "log") ||
return 0; # can't open log dir return 0; # can't open log dir
@ -2121,7 +2120,7 @@ sub singletest {
} }
else { else {
if(!$short) { if(!$short) {
logmsg " valgrind SKIPPED"; logmsg " valgrind SKIPPED\n";
} }
$ok .= "-"; # skipped $ok .= "-"; # skipped
} }