X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Ftest.pl;h=7b1568523aeb7e50315665c3a7b399409fc2b7d7;hb=ced497e2fca8b0ac1628855f422776e9bf331e65;hp=1562854056818c040715bc16c6a602ecb591e855;hpb=485f531e502dcba5ee00641e3b64706a16e1b995;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/test.pl b/t/test.pl
index 1562854..7b15685 100644
--- a/t/test.pl
+++ b/t/test.pl
@@ -294,7 +294,9 @@ sub curr_test {
 }
 
 sub next_test {
+  my $retval = $test;
   $test = $test + 1; # don't use ++
+  $retval;
 }
 
 # Note: can't pass multipart messages since we try to
@@ -521,10 +523,11 @@ sub runperl {
 	my @keys = grep {exists $ENV{$_}} qw(CDPATH IFS ENV BASH_ENV);
 	local @ENV{@keys} = ();
 	# Untaint, plus take out . and empty string:
+	local $ENV{'DCL$PATH'} = $1 if $is_vms && ($ENV{'DCL$PATH'} =~ /(.*)/s);
 	$ENV{PATH} =~ /(.*)/s;
 	local $ENV{PATH} =
 	    join $sep, grep { $_ ne "" and $_ ne "." and
-		($is_mswin or !(stat && (stat _)[2]&0022)) }
+		($is_mswin or $is_vms or !(stat && (stat _)[2]&0022)) }
 		    split quotemeta ($sep), $1;
 
 	$runperl =~ /(.*)/s;