X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F30-skip.t;h=b758af10fc973ef299b38a96a14d1d08bf55fd08;hb=aa878ce1d2bcea2391756feff7a015a117083a57;hp=f693a29822c705fc1f3cd86bc7674c226e33a165;hpb=5b7da288da2757d62ecaa3de0c40ea876ef9be2b;p=perl%2Fmodules%2FTest-Valgrind.git diff --git a/t/30-skip.t b/t/30-skip.t index f693a29..b758af1 100644 --- 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,7 +15,7 @@ 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'; } @@ -29,8 +31,7 @@ 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: { @@ -45,7 +46,7 @@ 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'; }