X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FTest%2FValgrind%2FSession.pm;h=b0069df7fdf1c2534218f2b644d42a75a8add912;hb=39af0cb1411f565d286cd656a7a0bdd3d3ba07fb;hp=fdb51c2313cf57c0177e54d3f8a8ef37a277ea2a;hpb=63f17cfcf624bc6764d32a7e674baf6329fd2d4a;p=perl%2Fmodules%2FTest-Valgrind.git diff --git a/lib/Test/Valgrind/Session.pm b/lib/Test/Valgrind/Session.pm index fdb51c2..b0069df 100644 --- a/lib/Test/Valgrind/Session.pm +++ b/lib/Test/Valgrind/Session.pm @@ -43,6 +43,7 @@ use base qw; min_version => $min_version, regen_def_supp => $regen_def_supp, no_def_supp => $no_def_supp, + allow_no_supp => $allow_no_supp, extra_supps => \@extra_supps, ); @@ -84,6 +85,12 @@ Defaults to false. =item * +If C<$allow_no_supp> is true, the command will always be run into C even if no appropriate suppression file is available. + +Defaults to false. + +=item * + C<$extra_supps> is a reference to an array of optional suppression files that will be passed to C. Defaults to none. @@ -141,6 +148,7 @@ sub new { version => $version, regen_def_supp => delete($args{regen_def_supp}), no_def_supp => delete($args{no_def_supp}), + allow_no_supp => delete($args{allow_no_supp}), extra_supps => $extra_supps, }, $class; } @@ -182,9 +190,20 @@ Read-only accessor for the C option. Read-only accessor for the C option. +=head2 C + + my $allow_no_supp = $tvs->allow_no_supp; + +Read-only accessor for the C option. + =cut -eval "sub $_ { \$_[0]->{$_} }" for qw; +eval "sub $_ { \$_[0]->{$_} }" for qw< + valgrind + regen_def_supp + no_def_supp + allow_no_supp +>; =head2 C @@ -211,26 +230,25 @@ If the command is a L object, the action and =cut sub run { - my $self = shift; - - my %args = @_; - - $self->start(%args); - my $guard = Test::Valgrind::Session::Guard->new(sub { $self->finish }); - - $self->_run($args{command}); -} + my ($self, %args) = @_; -sub _run { - my ($self, $cmd) = @_; + for (qw) { + my $base = 'Test::Valgrind::' . ucfirst; + my $value = $args{$_}; + $self->_croak("Invalid $_") unless Scalar::Util::blessed($value) + and $value->isa($base); + $self->$_($args{$_}) + } + my $cmd = $self->command; if ($cmd->isa('Test::Valgrind::Command::Aggregate')) { - $self->_run($_) for $cmd->commands; + for my $subcmd ($cmd->commands) { + $args{command} = $subcmd; + $self->run(%args); + } return; } - $self->command($cmd); - $self->report($self->report_class->new_diag( 'Using valgrind ' . $self->version . ' located at ' . $self->valgrind )); @@ -240,35 +258,53 @@ sub _run { my @supp_args; if ($self->do_suppressions) { push @supp_args, '--gen-suppressions=all'; - } elsif (not $self->no_def_supp) { - my $def_supp = $self->def_supp_file; - my $forced; - if ($self->regen_def_supp and -e $def_supp) { - 1 while unlink $def_supp; - $forced = 1; + } else { + if (!$self->no_def_supp) { + my $def_supp = $self->def_supp_file; + my $forced; + if ($self->regen_def_supp and -e $def_supp) { + 1 while unlink $def_supp; + $forced = 1; + } + if (defined $def_supp and not -e $def_supp) { + $self->report($self->report_class->new_diag( + 'Generating suppressions' . ($forced ? ' (forced)' : '') . '...' + )); + require Test::Valgrind::Suppressions; + Test::Valgrind::Suppressions->generate( + tool => $self->tool, + command => $self->command, + target => $def_supp, + ); + $self->_croak('Couldn\'t generate suppressions') unless -e $def_supp; + $self->report($self->report_class->new_diag( + "Suppressions for this perl stored in $def_supp" + )); + } } - if (defined $def_supp and not -e $def_supp) { + my @supp_files = grep { + -e $_ and $self->command->check_suppressions_file($_) + } $self->suppressions; + if (@supp_files > 1) { + my $files_list = join "\n", map " $_", @supp_files; $self->report($self->report_class->new_diag( - 'Generating suppressions' . ($forced ? ' (forced)' : '') . '...' + "Using suppressions from:\n$files_list" )); - require Test::Valgrind::Suppressions; - Test::Valgrind::Suppressions->generate( - tool => $self->tool, - command => $self->command, - target => $def_supp, - ); - $self->_croak('Couldn\'t generate suppressions') unless -e $def_supp; + } elsif (@supp_files) { $self->report($self->report_class->new_diag( - "Suppressions for this perl stored in $def_supp" + "Using suppressions from $supp_files[0]" )); + } elsif ($self->allow_no_supp) { + $self->report($self->report_class->new_diag("No suppressions used")); + } else { + $self->_croak("No compatible suppressions available"); } - for ($self->suppressions) { - next unless -e $_; - $self->report($self->report_class->new_diag("Using suppression file $_")); - push @supp_args, "--suppressions=$_"; - } + @supp_args = map "--suppressions=$_", @supp_files; } + my $guard = Test::Valgrind::Session::Guard->new(sub { $self->finish }); + $self->start; + pipe my $vrdr, my $vwtr or $self->_croak("pipe(\$vrdr, \$vwtr): $!"); { my $oldfh = select $vrdr; @@ -280,7 +316,10 @@ sub _run { $self->_croak("fork(): $!") unless defined $pid; if ($pid == 0) { - eval 'setpgrp 0, 0'; + { + local $@; + eval { setpgrp(0, 0) }; + } close $vrdr or $self->_croak("close(\$vrdr): $!"); fcntl $vwtr, Fcntl::F_SETFD(), 0 or $self->_croak("fcntl(\$vwtr, F_SETFD, 0): $!"); @@ -301,12 +340,14 @@ sub _run { local $SIG{INT} = sub { kill -(POSIX::SIGKILL()) => $pid; waitpid $pid, 0; - die 'interrupted'; + die 'valgrind analysis was interrupted'; }; close $vwtr or $self->_croak("close(\$vwtr): $!"); - $self->parser->parse($self, $vrdr); + my $aborted = $self->parser->parse($self, $vrdr); + + kill -(POSIX::SIGKILL()) => $pid if $aborted; $self->{exit_code} = (waitpid($pid, 0) == $pid) ? $? >> 8 : 255; @@ -424,11 +465,7 @@ sub suppressions { =head2 C - $tvs->start( - action => $action, - tool => $tool, - command => $command, - ); + $tvs->start; Starts the action and tool associated to the current run. It's automatically called at the beginning of L. @@ -438,16 +475,6 @@ It's automatically called at the beginning of L. sub start { my $self = shift; - my %args = @_; - - for (qw) { - my $base = 'Test::Valgrind::' . ucfirst; - my $value = $args{$_}; - $self->_croak("Invalid $_") unless Scalar::Util::blessed($value) - and $value->isa($base); - $self->$_($args{$_}) - } - delete @{$self}{qw}; $self->tool->start($self);