mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
When valgrind is disabled in the test file, don't run it at all (as opposed
to running it and ignoring its output).
This commit is contained in:
parent
26c1c8b2ad
commit
b7dd186d36
@ -1746,7 +1746,8 @@ sub singletest {
|
||||
$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";
|
||||
}
|
||||
|
||||
@ -2091,9 +2092,7 @@ sub singletest {
|
||||
|
||||
if($valgrind) {
|
||||
# this is the valid protocol blurb curl should generate
|
||||
my @disable= getpart("verify", "valgrind");
|
||||
|
||||
if($disable[0] !~ /disable/) {
|
||||
if($usevalgrind) {
|
||||
|
||||
opendir(DIR, "log") ||
|
||||
return 0; # can't open log dir
|
||||
@ -2121,7 +2120,7 @@ sub singletest {
|
||||
}
|
||||
else {
|
||||
if(!$short) {
|
||||
logmsg " valgrind SKIPPED";
|
||||
logmsg " valgrind SKIPPED\n";
|
||||
}
|
||||
$ok .= "-"; # skipped
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user