X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Ftest.pl;h=4e00816bf7c94fd757a392abf3a7d4b08ea41ade;hb=ee94f8101362ee382e42ec2d404d79b0ab7d17ef;hp=1e8ed9cf860124ec935b77dde5fb7115014f9a1c;hpb=35a603864810a769960255e50b84d5fab2473ee8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/test.pl b/t/test.pl
index 1e8ed9c..4e00816 100644
--- a/t/test.pl
+++ b/t/test.pl
@@ -258,6 +258,7 @@ sub like_yn ($$$@) {
 	unshift(@mess, "#      got '$got'\n",
 		"# expected /$expected/\n");
     }
+    local $Level = 2;
     _ok($pass, _where(), $name, @mess);
 }
 
@@ -296,7 +297,7 @@ sub todo_skip {
     my $n   = @_ ? shift : 1;
 
     for (1..$n) {
-        print STDOUT "ok $test # TODO & SKIP: $why\n";
+        print STDOUT "not ok $test # TODO & SKIP: $why\n";
         $test++;
     }
     local $^W = 0;
@@ -480,6 +481,15 @@ sub runperl {
     die "test.pl:runperl() does not take a hashref"
 	if ref $_[0] and ref $_[0] eq 'HASH';
     my $runperl = &_create_runperl;
+    if (${^TAINT}) {
+	# We will assume that if you're running under -T, you really mean
+	# to run a fresh perl, so we'll brute force launder everything for
+	# you
+	foreach ($runperl, $ENV{PATH}) {
+	    $_ =~ /(.*)/s;
+	    $_ = $1;
+	}
+    }
     my $result = `$runperl`;
     $result =~ s/\n\n/\n/ if $is_vms; # XXX pipes sometimes double these
     return $result;