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

diff --git a/t/TEST b/t/TEST
index ec388a9..f2f623d 100755
--- a/t/TEST
+++ b/t/TEST
@@ -19,6 +19,7 @@ if ($#ARGV >= 0) {
 	push( @argv, $ARGV[$idx] ), next unless $ARGV[$idx] =~ /^-(\S+)$/;
 	$core    = 1 if $1 eq 'core';
 	$verbose = 1 if $1 eq 'v';
+	$torture = 1 if $1 eq 'torture';
 	$with_utf= 1 if $1 eq 'utf8';
         $byte_compile = 1 if $1 eq 'bytecompile';
         $compile = 1 if $1 eq 'compile';
@@ -96,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]!)
 		{
@@ -110,9 +111,11 @@ unless (@ARGV) {
     } else {
         warn "$0: cannot open $mani: $!\n";
     }
-    _find_tests('pod')  unless $core;
-    _find_tests('x2p')  unless $core;
-    _find_tests('japh') unless $core;
+    unless ($core) {
+	_find_tests('pod');  
+	_find_tests('x2p');
+	_find_tests('japh') if $torture;
+    }
 }
 
 # Tests known to cause infinite loops for the perlcc tests.
@@ -203,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 {
@@ -254,7 +257,7 @@ EOT
 
 open HACK, '.\\perl $pl2c $test_executable |';
 # cl.exe prints the name of the .c file on stdout (\%^\$^#)
-while(<HACK>) {m/^\w+\.[cC]\$/ && next;print}
+while(<HACK>) {m/^\\w+\\.[cC]\$/ && next;print}
 open HACK, '$test_executable |';
 while(<HACK>) {print}
 EOT
@@ -318,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