mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-21 01:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

runtests: remove the valgrind parser

Browse Source 
Old legacy parsing that 1) hid problems for us and 2) probably isn't
needed anymore.
This commit is contained in:
Daniel Stenberg 2016-12-21 15:10:14 +01:00
parent f81b2277a8
commit 5c823f51db
2 changed files with 3 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/runtests.pl
View File

@ -3594,7 +3594,7 @@ sub singletest {
$usevalgrind = 1;
my $valgrindcmd = "$valgrind ";
$valgrindcmd .= "$valgrind_tool " if($valgrind_tool);
$valgrindcmd .= "--leak-check=yes ";
$valgrindcmd .= "--quiet --leak-check=yes ";
$valgrindcmd .= "--suppressions=$srcdir/valgrind.supp ";
# $valgrindcmd .= "--gen-suppressions=all ";
$valgrindcmd .= "--num-callers=16 ";

85
tests/valgrind.pm
View File

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@ -26,90 +26,9 @@ sub valgrindparse {
my ($srcdir, # the dir in which the runtests script resides
$sslenabled,
$file) = @_;
my $leak;
my $invalidread;
my $uninitedvar;
my $error;
my $partial;
my $us;
my @o;
my $bt=0;
my $nssinit=0;
open(VAL, "<$file");
while(<VAL>) {
if($bt) {
# back trace parsing
if($_ =~ /^==(\d+)== *(at|by) 0x([0-9A-F]+): (.*)/) {
my $w = $4;
if($w =~ /(.*) \(([^:]*):(\d+)/) {
my ($func, $source, $line)=($1, $2, $3);
my $sourcename = basename($source);
if(-f "$srcdir/../src/$sourcename" ||
-f "$srcdir/../lib/$sourcename") {
# this is our source
# print "$func() at $source:$line\n";
$us++;
} #else {print "Not our source: $func, $source, $line\n";}
}
# the memory leakage within NSS_InitContext is not a bug of curl
if($w =~ /NSS_InitContext/) {
$nssinit++;
}
}
else {
if($us and not $nssinit) {
# the stack trace included source details about us
$error++;
if($leak) {
push @o, "\n Leaked $leak bytes\n";
}
if($invalidread) {
push @o, "\n Read $invalidread invalid bytes\n";
}
if($uninitedvar) {
push @o, "\n Conditional jump or move depends on uninitialised value(s)\n";
}
}
$bt = 0; # no more backtrace
$us = 0;
$nssinit = 0;
}
}
else {
if($_ =~ /(\d+) bytes in (\d+) blocks are definitely lost/) {
$leak = $1;
if($leak) {
$error++;
}
$bt = 1;
}
elsif($_ =~ /Invalid read of size (\d+)/) {
$invalidread = $1;
$error++;
$bt = 1;
}
elsif($_ =~ /Conditional jump or move/) {
# If we require SSL, this test case most probaly makes
# us use OpenSSL. OpenSSL produces numerous valgrind
# errors of this kind, rendering it impossible for us to
# detect (valid) reports on actual curl or libcurl code.
if(!$sslenabled) {
$uninitedvar = 1;
$error++;
$bt = 1;
}
else {
$partial=1;
}
}
}
}
@o = <VAL>;
close(VAL);
return @o;
}