moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

fixed the valgrind log check and make it possible to disable it for a specific

Browse Source 
test, see test 509
This commit is contained in:
Daniel Stenberg 2005-01-07 21:11:13 +00:00
parent 9cdf6fb64b
commit 5a8097a4d5
2 changed files with 62 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/FILEFORMAT
View File

@ -190,4 +190,7 @@ the file's contents must be identical to this
<upload>
the contents of the upload data curl should have sent
</upload>
<valgrind>
disable - disables the valgrind log check for this test
</valgrind>
</verify>

91
tests/runtests.pl
View File

@ -1351,13 +1351,6 @@ sub singletest {
return 1;
}
# the test succeeded, remove all log files
if(!$keepoutfiles) {
cleardir($LOGDIR);
}
unlink($FTPDCMD); # remove the instructions for this test
@what = getpart("client", "killserver");
for(@what) {
my $serv = $_;
@ -1398,41 +1391,75 @@ sub singletest {
}
}
if($valgrind) {
opendir(DIR, "log") ||
return 0; # can't open log dir
my @files = readdir(DIR);
closedir DIR;
my $f;
my $l;
foreach $f (@files) {
if($f =~ /^valgrind$testnum/) {
$l = $f;
last;
# this is the valid protocol blurb curl should generate
my @disable= getpart("verify", "valgrind");
if($disable[0] !~ /disable/) {
opendir(DIR, "log") ||
return 0; # can't open log dir
my @files = readdir(DIR);
closedir DIR;
my $f;
my $l;
foreach $f (@files) {
if($f =~ /^valgrind$testnum\.pid/) {
$l = $f;
last;
}
}
my $leak;
my $invalidread;
my $error;
open(VAL, "<log/$l");
while(<VAL>) {
if($_ =~ /definitely lost: (\d*) bytes/) {
$leak = $1;
if($leak) {
$error++;
}
last;
}
if($_ =~ /Invalid read of size (\d+)/) {
$invalidread = $1;
$error++;
last;
}
}
close(VAL);
if($error) {
print " valgrind ERROR ";
if($leak) {
print "\n Leaked $leak bytes\n";
}
if($invalidread) {
print "\n Read $invalidread invalid bytes\n";
}
return 1;
}
elsif(!$short) {
print " valgrind OK";
}
}
my $leak;
open(VAL, "<$l");
while(<VAL>) {
if($_ =~ /definitely lost: (\d*) bytes/) {
$leak = $1;
last;
else {
if(!$short) {
print " valgrind SKIPPED";
}
}
close(VAL);
if($leak) {
print " valgrind ERROR ";
}
elsif(!$short) {
print " valgrind OK";
}
}
if($short) {
print "OK";
}
print "\n";
# the test succeeded, remove all log files
if(!$keepoutfiles) {
cleardir($LOGDIR);
}
unlink($FTPDCMD); # remove the instructions for this test
return 0;
}