Make sure auxillary tests don't pick up the system valgrind

diff --git a/t/30-skip.t b/t/30-skip.t
index f693a29822c705fc1f3cd86bc7674c226e33a165..d073aceb499f44c9abf2f4ec7eb889d3948a36cd 100644 (file)
--- a/t/30-skip.t
+++ b/t/30-skip.t
@@ -3,6 +3,8 @@
 use strict;
 use warnings;
 
+BEGIN { delete $ENV{PATH} }
+
 use lib 't/lib';
 use VPIT::TestHelpers 'capture';
 

diff --git a/t/70-session.t b/t/70-session.t
index 1ce46c53a728206a1af257f25c47309acf929651..c9c3cc4e28f3ba226a32a5c3219a081c82f59d69 100644 (file)
--- a/t/70-session.t
+++ b/t/70-session.t
@@ -3,6 +3,8 @@
 use strict;
 use warnings;
 
+BEGIN { delete $ENV{PATH} }
+
 use Test::Valgrind::Session;
 
 use Test::More tests => 7;

diff --git a/t/71-session-command.t b/t/71-session-command.t
index 54ce89dd424b8684d5e6b848db50eac7165e6a56..12e45e6361d864d23971246aaa9746bd7ef54d6d 100644 (file)
--- a/t/71-session-command.t
+++ b/t/71-session-command.t
@@ -3,6 +3,8 @@
 use strict;
 use warnings;
 
+BEGIN { delete $ENV{PATH} }
+
 use Test::More tests => 2;
 
 use Test::Valgrind::Command;

diff --git a/t/80-suppressions.t b/t/80-suppressions.t
index bc003f29aa49ebcb21cd8d116ded6abc8ec0831c..a57aca3a08a26831cc25d53d1626b6f2f2e18149 100644 (file)
--- a/t/80-suppressions.t
+++ b/t/80-suppressions.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 4;
 
 use Test::Valgrind::Command;
 use Test::Valgrind::Tool;
@@ -59,57 +59,60 @@ my $tool = Test::Valgrind::Tool::Dummy->new();
 
 my $dummy_action = Test::Valgrind::Action::Dummy->new();
 
-my $sess = eval { Test::Valgrind::Session->new(
- min_version => $tool->requires_version,
-) };
-
-if (my $err = $@) {
- $err =~ s/^(Empty valgrind candidates list|No appropriate valgrind executable could be found)\s+at.*/$1/;
- plan skip_all => $err;
-} else {
- plan tests => 4;
-}
+SKIP: {
+ my $sess = eval { Test::Valgrind::Session->new(
+  min_version => $tool->requires_version,
+ ) };
+ if (my $err = $@) {
+  if ($err =~ /^(Empty valgrind candidates list|No appropriate valgrind executable could be found)\s+at.*/) {
+   $err = $1;
+  }
+  skip $err => 2;
+ }
 
-$sess->command($cmd);
-$sess->tool($tool);
-
-my $file    = $sess->def_supp_file;
-my $VERSION = quotemeta $Test::Valgrind::Session::VERSION;
-my $exp     = qr!$VERSION/memcheck-\d+(?:\.\d+)*-[0-9a-f]{32}\.supp$!;
-like $file, $exp, 'default suppression file is correctly named';
-
-my $res = open my $supp_fh, '<', $file;
-my $err = $!;
-ok $res, 'default suppression file can be opened';
-diag "open($file): $err" unless $res;
-
-if ($res) {
- my ($count, $non_empty, $perl_related) = (0, 0, 0);
- my ($in, $valid_frames, $seen_perl);
- while (<$supp_fh>) {
-  chomp;
-  s/^\s*//;
-  s/\s*$//;
-  if (!$in && $_ eq '{') {
-   $in           = 1;
-   $valid_frames = 0;
-   $seen_perl    = 0;
-  } elsif ($in) {
-   if ($_ eq '}') {
-    ++$count;
-    ++$non_empty    if $valid_frames;
-    ++$perl_related if $seen_perl;
-    $in = 0;
-   } else {
-    ++$valid_frames if /^\s*fun:/;
-    ++$seen_perl    if /^\s*fun:Perl_/;
+ $sess->command($cmd);
+ $sess->tool($tool);
+
+ my $file    = $sess->def_supp_file;
+ my $VERSION = quotemeta $Test::Valgrind::Session::VERSION;
+ my $exp     = qr!$VERSION/memcheck-\d+(?:\.\d+)*-[0-9a-f]{32}\.supp$!;
+ like $file, $exp, 'default suppression file is correctly named';
+
+ my $res = open my $supp_fh, '<', $file;
+ my $err = $!;
+ ok $res, 'default suppression file can be opened';
+ diag "open($file): $err" unless $res;
+
+ if ($res) {
+  my ($count, $non_empty, $perl_related) = (0, 0, 0);
+  my ($in, $valid_frames, $seen_perl);
+  while (<$supp_fh>) {
+   chomp;
+   s/^\s*//;
+   s/\s*$//;
+   if (!$in && $_ eq '{') {
+    $in           = 1;
+    $valid_frames = 0;
+    $seen_perl    = 0;
+   } elsif ($in) {
+    if ($_ eq '}') {
+     ++$count;
+     ++$non_empty    if $valid_frames;
+     ++$perl_related if $seen_perl;
+     $in = 0;
+    } else {
+     ++$valid_frames if /^\s*fun:/;
+     ++$seen_perl    if /^\s*fun:Perl_/;
+    }
    }
   }
+  diag "The default suppression file contains $count suppressions, of which $non_empty are not empty and $perl_related apply to perl";
+  close $supp_fh;
  }
- diag "The default suppression file contains $count suppressions, of which $non_empty are not empty and $perl_related apply to perl";
- close $supp_fh;
 }
 
+delete $ENV{PATH};
+
 SKIP: {
  my $dummy_vg = Test::Valgrind::FakeValgrind->new();
  skip $dummy_vg => 2 unless ref $dummy_vg;

diff --git a/t/81-suppressions-demangle.t b/t/81-suppressions-demangle.t
index 232306b93fcab24f499a614555006bbabf07c4ef..65572c7fab4183ed14b426b556b60bcce29245cf 100644 (file)
--- a/t/81-suppressions-demangle.t
+++ b/t/81-suppressions-demangle.t
@@ -3,6 +3,8 @@
 use strict;
 use warnings;
 
+BEGIN { delete $ENV{PATH} }
+
 use Test::More tests => 2 * 7;
 
 use Test::Valgrind::Suppressions;