X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=92a9d8fd0ebd4921a35a1189d2c28d4ff1fcfe9b;hb=5f8f474f92873b98b96654c46947e4e91c90a5c2;hp=9ac287a7f4a5794a668313d103eca43f45c87476;hpb=5dc83c4054cb6624685a80f58caabe5e173a543f;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/TEST b/t/TEST
index 9ac287a..92a9d8f 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]!)
 		{
@@ -228,7 +228,7 @@ EOT
 	my $testswitch = '-I. -MTestInit'; # -T will strict . from @INC
 	if ($type eq 'deparse') {
 	    my $deparse =
-		"./perl $testswitch $switch -I../lib -MO=-qq,Deparse,".
+		"./perl $testswitch $switch -I../lib -MO=-qq,Deparse,-sv1.,".
 		"-l$deparse_opts$file_opts ".
 		"$test > $test.dp ".
 		"&& ./perl $testswitch $switch -I../lib $test.dp |";
@@ -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