X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=1329205b0c2a3bca51f20a3146b5be094d2abdab;hb=25f64a11de689eea2260b6bdee0819ca648746ff;hp=6fe2da58d605e8d8ce313365dc9d250b42b1b273;hpb=5157cb1ba3ce3ac3ce7a1f0d200205370f496621;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/TEST b/t/TEST
index 6fe2da5..1329205 100755
--- a/t/TEST
+++ b/t/TEST
@@ -9,6 +9,9 @@ $| = 1;
 # which live dual lives on CPAN.
 $ENV{PERL_CORE} = 1;
 
+# remove empty elements due to insertion of empty symbols via "''p1'" syntax
+@ARGV = grep($_,@ARGV) if $^O eq 'VMS';
+
 # Cheesy version of Getopt::Std.  Maybe we should replace it with that.
 @argv = ();
 if ($#ARGV >= 0) {
@@ -16,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';
@@ -64,36 +68,54 @@ sub _find_tests {
     foreach my $f (sort { $a cmp $b } readdir DIR) {
         next if $f eq $curdir or $f eq $updir;
 
-        my $fullpath = File::Spec->catdir($dir, $f);
+        my $fullpath = File::Spec->catfile($dir, $f);
 
         _find_tests($fullpath) if -d $fullpath;
+        $fullpath = VMS::Filespec::unixify($fullpath) if $^O eq 'VMS';
         push @ARGV, $fullpath if $f =~ /\.t$/;
     }
 }
 
+sub _quote_args {
+    my ($args) = @_;
+    my $argstring = '';
+
+    foreach (split(/\s+/,$args)) {
+       # In VMS protect with doublequotes because otherwise
+       # DCL will lowercase -- unless already doublequoted.
+       $_ = q(").$_.q(") if ($^O eq 'VMS') && !/^\"/ && length($_) > 0;
+       $argstring .= ' ' . $_;
+    }
+    return $argstring;
+}
+
 unless (@ARGV) {
     foreach my $dir (qw(base comp cmd run io op uni)) {
         _find_tests($dir);
     }
     _find_tests("lib") unless $core;
-    my $mani = File::Spec->catdir($updir, "MANIFEST");
+    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!) {
 		$t = $1;
 		if (!$core || $t =~ m!^lib/[a-z]!)
 		{
-		    $path = File::Spec->catdir($updir, $t);
+		    $path = File::Spec->catfile($updir, $t);
 		    push @ARGV, $path;
 		    $name{$path} = $t;
 		}
 	    }
 	}
+	close MANI;
     } else {
         warn "$0: cannot open $mani: $!\n";
     }
-    _find_tests('pod');
-    _find_tests('x2p');
+    unless ($core) {
+	_find_tests('pod');  
+	_find_tests('x2p');
+	_find_tests('japh') if $torture;
+    }
 }
 
 # Tests known to cause infinite loops for the perlcc tests.
@@ -138,8 +160,12 @@ EOT
     $files  = 0;
     $totmax = 0;
 
-    foreach (@tests) {
-        $name{$_} = File::Spec->catdir('t',$_) unless exists $name{$_};
+    foreach my $t (@tests) {
+      unless (exists $name{$t}) {
+        my $tname = File::Spec->catfile('t',$t);
+        $tname = VMS::Filespec::unixify($tname) if $^O eq 'VMS';
+        $name{$t} = $tname;
+      }
     }
     my $maxlen = 0;
     foreach (@name{@tests}) {
@@ -168,15 +194,19 @@ EOT
 		next;
 	    }
 	}
-	$te = $name{$test};
-	print "$te" . '.' x ($dotdotdot - length($te));
+	$te = $name{$test} . '.' x ($dotdotdot - length($name{$test}));
+
+	if ($^O ne 'VMS') {  # defer printing on VMS due to piping bug
+	    print $te;
+	    $te = '';
+	}
 
 	$test = $OVER{$test} if exists $OVER{$test};
 
  	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 {
@@ -207,7 +237,8 @@ EOT
 	}
 	elsif ($type eq 'perl') {
 	    my $perl = $ENV{PERL} || './perl';
-	    my $run = "$perl $testswitch $switch $utf $test |";
+	    my $redir = ($^O eq 'VMS' ? '2>&1' : '');
+	    my $run = "$perl" . _quote_args("$testswitch $switch $utf") . " $test $redir|";
 	    open(RESULTS,$run) or print "can't run '$run': $!.\n";
 	}
 	else {
@@ -226,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
@@ -245,6 +276,7 @@ EOT
         $ok = 0;
         $next = 0;
 	while (<RESULTS>) {
+	    next if /^\s*$/; # skip blank lines
 	    if ($verbose) {
 		print $_;
 	    }
@@ -289,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
@@ -303,17 +335,17 @@ EOT
         }
 	if ($ok && $next == $max ) {
 	    if ($max) {
-		print "ok\n";
+		print "${te}ok\n";
 		$good = $good + 1;
 	    }
 	    else {
-		print "skipping test on this platform\n";
+		print "${te}skipping test on this platform\n";
 		$files -= 1;
 	    }
 	}
 	else {
 	    $next += 1;
-	    print "FAILED at test $next\n";
+	    print "${te}FAILED at test $next\n";
 	    $bad = $bad + 1;
 	    $_ = $test;
 	    if (/^base/) {
@@ -340,37 +372,37 @@ EOT
 	    warn "Failed $bad test scripts out of $files, $pct% okay.\n";
 	}
 	warn <<'SHRDLU_1';
-   ### Since not all tests were successful, you may want to run some of
-   ### them individually and examine any diagnostic messages they produce.
-   ### See the INSTALL document's section on "make test".
+### Since not all tests were successful, you may want to run some of
+### them individually and examine any diagnostic messages they produce.
+### See the INSTALL document's section on "make test".
 SHRDLU_1
 	warn <<'SHRDLU_2' if $good / $total > 0.8;
-   ### You have a good chance to get more information by running
-   ###     ./perl harness
-   ### in the 't' directory since most (>=80%) of the tests succeeded.
+### You have a good chance to get more information by running
+###   ./perl harness
+### in the 't' directory since most (>=80%) of the tests succeeded.
 SHRDLU_2
         if (eval {require Config; import Config; 1}) {
 	    if ($Config{usedl} && (my $p = $Config{ldlibpthname})) {
 		warn <<SHRDLU_3;
-   ### You may have to set your dynamic library search path,
-   ### $p, to point to the build directory:
+### You may have to set your dynamic library search path,
+### $p, to point to the build directory:
 SHRDLU_3
                 if (exists $ENV{$p} && $ENV{$p} ne '') {
 		    warn <<SHRDLU_4a;
-   ###     setenv $p `pwd`:\$$p; cd t; ./perl harness
-   ###     $p=`pwd`:\$$p; export $p; cd t; ./perl harness
-   ###     export $p=`pwd`:\$$p; cd t; ./perl harness
+###   setenv $p `pwd`:\$$p; cd t; ./perl harness
+###   $p=`pwd`:\$$p; export $p; cd t; ./perl harness
+###   export $p=`pwd`:\$$p; cd t; ./perl harness
 SHRDLU_4a
                 } else {
 		    warn <<SHRDLU_4b;
-   ###     setenv $p `pwd`; cd t; ./perl harness
-   ###     $p=`pwd`; export $p; cd t; ./perl harness
-   ###     export $p=`pwd`; cd t; ./perl harness
+###   setenv $p `pwd`; cd t; ./perl harness
+###   $p=`pwd`; export $p; cd t; ./perl harness
+###   export $p=`pwd`; cd t; ./perl harness
 SHRDLU_4b
                 }    
 		warn <<SHRDLU_5;
-   ### for csh-style shells, like tcsh; or for traditional/modern
-   ### Bourne-style shells, like bash, ksh, and zsh, respectively.
+### for csh-style shells, like tcsh; or for traditional/modern
+### Bourne-style shells, like bash, ksh, and zsh, respectively.
 SHRDLU_5
             }
 	}