Improve detection of executables

[perl/modules/Test-Valgrind.git] / t / 30-skip.t

diff --git a/t/30-skip.t b/t/30-skip.t
index f693a29822c705fc1f3cd86bc7674c226e33a165..5a35a2c96b4a453a1fd6357f25a019868d1fdf95 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';
 
@@ -13,13 +15,11 @@ use Test::Valgrind::FakeValgrind;
 SKIP: {
  my ($stat, $out, $err) = capture_perl 'BEGIN { delete $ENV{PATH} } use Test::Valgrind; 1';
  skip CAPTURE_PERL_FAILED($out) => 1 unless defined $stat;
- like $out, qr/^1..0 # SKIP Empty valgrind candidates list/,
+ like $out, qr/^1\.\.0 # (?:SKIP|Skip) Empty valgrind candidates list/,
             'correctly skip when no valgrind is available';
 }
 
 SKIP: {
- skip 'Only on linux or darwin' => 1 unless $^O eq 'linux' or $^O eq 'darwin';
-
  my $old_vg = Test::Valgrind::FakeValgrind->new(
   exe_name => 'valgrind',
   version  => '3.0.0',
@@ -29,13 +29,10 @@ SKIP: {
 
  my ($stat, $out, $err) = capture_perl "BEGIN { \$ENV{PATH} = q[$tmp_dir] } use Test::Valgrind; 1";
  skip CAPTURE_PERL_FAILED($out) => 1 unless defined $stat;
- like $out, qr/^1..0 # SKIP No appropriate valgrind executable could be found/,
-            'correctly skip when no good valgrind was found';
+ like $out, qr/^1\.\.0 # (?:SKIP|Skip) No appropriate valgrind executable could be found/, 'correctly skip when no good valgrind was found';
 }
 
 SKIP: {
- skip 'Only on linux or darwin' => 1 unless $^O eq 'linux' or $^O eq 'darwin';
-
  my $new_vg = Test::Valgrind::FakeValgrind->new(
   exe_name => 'valgrind',
   version  => '3.4.0',
@@ -45,7 +42,6 @@ SKIP: {
 
  my ($stat, $out, $err) = capture_perl "BEGIN { \$ENV{PATH} = q[$tmp_dir] } use Test::Valgrind no_def_supp => 1, extra_supps => [ q[t/supp/no_perl] ]; 1";
  skip CAPTURE_PERL_FAILED($out) => 1 unless defined $stat;
- like $out, qr/^1..0 # SKIP No compatible suppressions available/,
+ like $out, qr/^1\.\.0 # (?:SKIP|Skip) No compatible suppressions available/,
             'correctly skip when no compatible suppressions were available';
 }
-