Importing Test-Valgrind-0.04.tar.gz

diff --git a/Changes b/Changes
index 95ebd37b74d0e3f4f7757d4f594f47a64c129308..aece5d7882bc72c0c48014f5f9d7f9b4413fbefb 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for Test-Valgrind
 
+0.04    2008-05-13 16:25 UTC
+        + Chg : Don't smoke this on 5.005 please.
+        + Chg : Better way to find the valgrind executable.
+
 0.03    2008-04-21 15:35 UTC
         + Fix : Include the mock Suppressions.pm rather than an empty file.
 

diff --git a/META.yml b/META.yml
index b6e5716d746c72b77f7814417296467925209c53..61a683098abed7a00070fbdcd5dddd1b1270414e 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                Test-Valgrind
-version:             0.03
+version:             0.04
 abstract:            Test Perl code through valgrind.
 license:             perl
 author:              

diff --git a/Makefile.PL b/Makefile.PL
index 1d37fb9cc8b427147f5454fbea4ed6a39c890012..221229fbbb6c4df9720c3d3374d221231b625418 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,25 +1,26 @@
+use 5.006;
+
 use strict;
 use warnings;
 use ExtUtils::MakeMaker;
 
-my $has_vg = 0;
 my $vg;
 print 'Checking for valgrind >= 3.1.0 in PATH... ';
 for (split /:/, $ENV{PATH}) {
- $vg = $_ . '/valgrind';
- if (-x $vg) {
-  my $ver = qx/$vg --version/;
+ $_ .= '/valgrind';
+ if (-x) {
+  my $ver = qx/$_ --version/;
   if ($ver =~ s/^valgrind-//) {
    $ver = join '', map chr, split /\./, $ver;
    if ($ver ge v3.1.0) {
-    print "yes, $vg\n";
-    $has_vg = 1;
+    print "yes, $_\n";
+    $vg = $_;
     last;
    }
   }
  }
 }
-if (!$has_vg) {
+if (!$vg) {
  print "no\n";
  die 'OS unsupported';
 }

diff --git a/README b/README
index 55a724758795c85eb3ecdc3b9216f1a8c53c17d1..10e0c557bfaf13520d9108514d06eb5463266515 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ NAME
     Test::Valgrind - Test Perl code through valgrind.
 
 VERSION
-    Version 0.03
+    Version 0.04
 
 SYNOPSIS
         use Test::More;

diff --git a/lib/Test/Valgrind.pm b/lib/Test/Valgrind.pm
index 506e11fae0ad25e09e5da5ddced3733f2a68418b..dd367da5b55646e4820bafdebb0e35a08714a5b3 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
 
@@ -88,20 +88,22 @@ 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;
-   }
-  }
-  if (!$valgrind) {
-   plan skip_all => 'No valgrind executable could be found in your path';
-   return;
-  }
   my $callers = $args{callers} || 50;
   $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;
+   } 
+  }
   pipe my $rdr, my $wtr or croak "pipe(\$rdr, \$wtr): $!";
   my $pid = fork;
   if (!defined $pid) {
@@ -131,7 +133,6 @@ 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;
   }
   close $wtr or croak "close(\$wtr): $!";

diff --git a/lib/Test/Valgrind/Suppressions.pm b/lib/Test/Valgrind/Suppressions.pm
index 8b2a1e95cc867053c2821c8c55f8dd706b76e525..6983537b153df033c6be109e33ec52f7fe8a41e9 100644 (file)
--- a/lib/Test/Valgrind/Suppressions.pm
+++ b/lib/Test/Valgrind/Suppressions.pm
@@ -9,11 +9,11 @@ Test::Valgrind::Suppressions - Placeholder for architecture-dependant perl suppr
 
 =head1 VERSION
 
-Version 0.03
+Version 0.04
 
 =cut
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 =head1 DESCRIPTION
 

diff --git a/lib/Test/Valgrind/Suppressions.tpl b/lib/Test/Valgrind/Suppressions.tpl
index 8b2a1e95cc867053c2821c8c55f8dd706b76e525..6983537b153df033c6be109e33ec52f7fe8a41e9 100644 (file)
--- a/lib/Test/Valgrind/Suppressions.tpl
+++ b/lib/Test/Valgrind/Suppressions.tpl
@@ -9,11 +9,11 @@ Test::Valgrind::Suppressions - Placeholder for architecture-dependant perl suppr
 
 =head1 VERSION
 
-Version 0.03
+Version 0.04
 
 =cut
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 =head1 DESCRIPTION