Teach t/17-ctl.t about perl 5.17.0

[perl/modules/Variable-Magic.git] / t / 17-ctl.t

diff --git a/t/17-ctl.t b/t/17-ctl.t
index ca22761333c3a5e5959aaddd4d6fb50a1af1d2d0..c32d7f1556d182d274d792de8736ae884b4dcc64 100644 (file)
--- a/t/17-ctl.t
+++ b/t/17-ctl.t
@@ -216,9 +216,10 @@ like $@, expect('tomato', undef, "\nBEGIN.*"),
 sub run_perl {
  my $code = shift;
 
- my $SystemRoot   = $ENV{SystemRoot};
+ my ($SystemRoot, $PATH) = @ENV{qw<SystemRoot PATH>};
  local %ENV;
  $ENV{SystemRoot} = $SystemRoot if $^O eq 'MSWin32' and defined $SystemRoot;
+ $ENV{PATH}       = $PATH       if $^O eq 'cygwin'  and defined $PATH;
 
  system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
 }
@@ -269,7 +270,9 @@ use Variable::Magic qw<wizard cast>; BEGIN { cast %::, wizard fetch => sub { die
  CODE
  skip 'Test code didn\'t run properly' => $count unless defined $output;
  my $suffix = "\nExecution(?s:.*)";
- if ("$]" >= 5.011005) {
+ if ("$]" >= 5.017) {
+  $suffix = "(?:\nsalsify at -e line \\d+.){16}" . $suffix;
+ } elsif ("$]" >= 5.011005) {
   $suffix = "(?:\nsalsify at -e line \\d+.){12}" . $suffix;
  } elsif ("$]" >= 5.011) {
   $suffix = "(?:\nsalsify at -e line \\d+.){3}" . $suffix;