No need to check the valgrind executable two times

[perl/modules/Test-Valgrind.git] / lib / Test / Valgrind.pm

diff --git a/lib/Test/Valgrind.pm b/lib/Test/Valgrind.pm
index 506e11fae0ad25e09e5da5ddced3733f2a68418b..838a3ae777223ad0952cf5862de84a7d8d37b399 100644 (file)
--- a/lib/Test/Valgrind.pm
+++ b/lib/Test/Valgrind.pm
@@ -17,11 +17,11 @@ Test::Valgrind - Test Perl code through valgrind.
 
 =head1 VERSION
 
-Version 0.03
+Version 0.04
 
 =cut
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 =head1 SYNOPSIS
 
@@ -55,7 +55,7 @@ If true, do not use any suppressions.
 
 =item C<< callers => $number >>
 
-Specify the maximum stack depth studied when valgrind encounters an error. Raising this number improves granularity. Default is 50.
+Specify the maximum stack depth studied when valgrind encounters an error. Raising this number improves granularity. Default is 12.
 
 =item C<< extra => [ @args ] >>
 
@@ -88,20 +88,23 @@ sub import {
    $file = $next;
   }
   return if not $file or $file eq '-e';
-  my $valgrind;
-  for (split /:/, $ENV{PATH}) {
-   my $vg = $_ . '/valgrind';
-   if (-x $vg) {
-    $valgrind = $vg;
-    last;
+  my $callers = $args{callers};
+  $callers = 12 unless defined $callers;
+  $callers = int $callers;
+  my $vg = Test::Valgrind::Suppressions::VG_PATH;
+  if (!$vg || !-x $vg) {
+   for (split /:/, $ENV{PATH}) {
+    $_ .= '/valgrind';
+    if (-x) {
+     $vg = $_;
+     last;
+    }
    }
+   if (!$vg) {
+    plan skip_all => 'No valgrind executable could be found in your path';
+    return;
+   } 
   }
-  if (!$valgrind) {
-   plan skip_all => 'No valgrind executable could be found in your path';
-   return;
-  }
-  my $callers = $args{callers} || 50;
-  $callers = int $callers;
   pipe my $rdr, my $wtr or croak "pipe(\$rdr, \$wtr): $!";
   my $pid = fork;
   if (!defined $pid) {
@@ -131,8 +134,7 @@ sub import {
    print STDERR "valgrind @args\n" if $args{diag};
    local $ENV{PERL_DESTRUCT_LEVEL} = 3;
    local $ENV{PERL_DL_NONLAZY} = 1;
-   my $vg = Test::Valgrind::Suppressions::VG_PATH;
-   exec $vg, @args if $vg and -x $vg;
+   exec $vg, @args;
   }
   close $wtr or croak "close(\$wtr): $!";
   local $SIG{INT} = sub { kill -(SIGTERM) => $pid };