X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=f2f623df797b556a6864b185e27adb235ecfdb90;hb=4cd2bd1f390724a103e72b993d7f67fb405628ad;hp=47560cdc717607e5366002247affafcb312cef76;hpb=e018f8be847d79ec3f2a470a400d481ec2d7bbd6;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/TEST b/t/TEST
index 47560cd..f2f623d 100755
--- a/t/TEST
+++ b/t/TEST
@@ -97,7 +97,7 @@ unless (@ARGV) {
     my $mani = File::Spec->catfile($updir, "MANIFEST");
     if (open(MANI, $mani)) {
         while (<MANI>) { # similar code in t/harness
-	    if (m!^(ext/\S+/?([^/]+\.t|test\.pl)|lib/\S+?(\.t|test\.pl))\s!) {
+	    if (m!^(ext/\S+/?(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
 		$t = $1;
 		if (!$core || $t =~ m!^lib/[a-z]!)
 		{
@@ -206,7 +206,7 @@ EOT
  	open(SCRIPT,"<$test") or die "Can't run $test.\n";
  	$_ = <SCRIPT>;
  	close(SCRIPT) unless ($type eq 'deparse');
- 	if (/#!.*\bperl.*-\w*([tT])/) {
+ 	if (/#!.*\bperl.*\s-\w*([tT])/) {
  	    $switch = qq{"-$1"};
  	}
  	else {
@@ -321,11 +321,11 @@ EOT
 	}
 	if ($ENV{PERL_3LOG}) {
 	    my $tpp = $test;
-	    $tpp =~ s:^../::;
+	    $tpp =~ s:^\.\./::;
 	    $tpp =~ s:/:_:g;
-	    $tpp =~ s:\.t$::;
-	    rename("perl.3log", "perl.3log.$tpp") ||
-		die "rename: perl3.log to perl.3log.$tpp: $!\n";
+	    $tpp =~ s:\.t$:.3log:;
+	    rename("perl.3log", $tpp) ||
+		die "rename: perl3.log to $tpp: $!\n";
 	}
 	$next = $next - 1;
         # test if the compiler compiled something