X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=c601e45977bbd531ead7a6f69d780e91adb68c0f;hb=2a5d9b1d41e4bafaa26126c5dea2f6ff0b72b6a7;hp=f724ecd83ca79869543a3231218df2e596f0c191;hpb=a58906773179c9740172c13629670adffd875da4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/TEST b/t/TEST
index f724ecd..c601e45 100755
--- a/t/TEST
+++ b/t/TEST
@@ -17,6 +17,7 @@ $ENV{PERL_CORE} = 1;
 
 # remove empty elements due to insertion of empty symbols via "''p1'" syntax
 @ARGV = grep($_,@ARGV) if $^O eq 'VMS';
+our $show_elapsed_time = $ENV{HARNESS_TIMER} || 0;
 
 # Cheesy version of Getopt::Std.  Maybe we should replace it with that.
 {
@@ -28,8 +29,6 @@ $ENV{PERL_CORE} = 1;
 	$::torture = 1 if $1 eq 'torture';
 	$::with_utf8 = 1 if $1 eq 'utf8';
 	$::with_utf16 = 1 if $1 eq 'utf16';
-	$::bytecompile = 1 if $1 eq 'bytecompile';
-	$::compile = 1 if $1 eq 'compile';
 	$::taintwarn = 1 if $1 eq 'taintwarn';
 	$ENV{PERL_CORE_MINITEST} = 1 if $1 eq 'minitest';
 	if ($1 =~ /^deparse(,.+)?$/) {
@@ -68,6 +67,7 @@ $ENV{EMXSHELL} = 'sh';        # For OS/2
 # Roll your own File::Find!
 use TestInit;
 use File::Spec;
+if ($show_elapsed_time) { require Time::HiRes }
 my $curdir = File::Spec->curdir;
 my $updir  = File::Spec->updir;
 
@@ -75,14 +75,14 @@ sub _find_tests {
     my($dir) = @_;
     opendir DIR, $dir or die "Trouble opening $dir: $!";
     foreach my $f (sort { $a cmp $b } readdir DIR) {
-        next if $f eq $curdir or $f eq $updir or
+	next if $f eq $curdir or $f eq $updir or
 	    $f =~ /^(?:CVS|RCS|SCCS|\.svn)$/;
 
-        my $fullpath = File::Spec->catfile($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$/;
+	_find_tests($fullpath) if -d $fullpath;
+	$fullpath = VMS::Filespec::unixify($fullpath) if $^O eq 'VMS';
+	push @ARGV, $fullpath if $f =~ /\.t$/;
     }
 }
 
@@ -105,7 +105,7 @@ sub _populate_hash {
 
 unless (@ARGV) {
     foreach my $dir (qw(base comp cmd run io op uni)) {
-        _find_tests($dir);
+	_find_tests($dir);
     }
     _find_tests("lib") unless $::core;
     # Config.pm may be broken for make minitest. And this is only a refinement
@@ -140,8 +140,9 @@ unless (@ARGV) {
     }
     my $mani = File::Spec->catfile($updir, "MANIFEST");
     if (open(MANI, $mani)) {
-        while (<MANI>) { # similar code in t/harness
-	    if (m!^(ext/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
+	my $ext_pat = $^O eq 'MSWin32' ? '(?:win32/)?ext' : 'ext';
+	while (<MANI>) { # similar code in t/harness
+	    if (m!^($ext_pat/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
 		my $t = $1;
 		my $extension = $2;
 		if (!$::core || $t =~ m!^lib/[a-z]!)
@@ -159,7 +160,7 @@ unless (@ARGV) {
 	}
 	close MANI;
     } else {
-        warn "$0: cannot open $mani: $!\n";
+	warn "$0: cannot open $mani: $!\n";
     }
     unless ($::core) {
 	_find_tests('pod');
@@ -168,19 +169,9 @@ unless (@ARGV) {
     }
 }
 
-# Tests known to cause infinite loops for the perlcc tests.
-# %::infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 );
-%::infinite = ();
-
 if ($::deparse) {
     _testprogs('deparse', '',   @ARGV);
 }
-elsif( $::compile ) { 
-    _testprogs('compile', '',   @ARGV);
-}
-elsif( $::bytecompile ) {
-    _testprogs('bytecompile', '', @ARGV);
-}
 elsif ($::with_utf16) {
     for my $e (0, 1) {
 	for my $b (0, 1) {
@@ -208,41 +199,25 @@ elsif ($::with_utf16) {
     }
 }
 else {
-    _testprogs('compile', '',   @ARGV) if -e "../testcompile";
     _testprogs('perl',    '',   @ARGV);
 }
 
 sub _testprogs {
     my ($type, $args, @tests) = @_;
 
-    print <<'EOT' if ($type eq 'compile');
-------------------------------------------------------------------------------
-TESTING COMPILER
-------------------------------------------------------------------------------
-EOT
-
     print <<'EOT' if ($type eq 'deparse');
 ------------------------------------------------------------------------------
 TESTING DEPARSER
 ------------------------------------------------------------------------------
 EOT
 
-    print <<EOT if ($type eq 'bytecompile');
-------------------------------------------------------------------------------
-TESTING BYTECODE COMPILER
-------------------------------------------------------------------------------
-EOT
-
-    $ENV{PERLCC_TIMEOUT} = 120
-          if ($type eq 'compile' && !$ENV{PERLCC_TIMEOUT});
-
     $::bad_files = 0;
 
     foreach my $t (@tests) {
       unless (exists $::path_to_name{$t}) {
-        my $tname = File::Spec->catfile('t',$t);
-        $tname = VMS::Filespec::unixify($tname) if $^O eq 'VMS';
-        $::path_to_name{$t} = $tname;
+	my $tname = File::Spec->catfile('t',$t);
+	$tname = VMS::Filespec::unixify($tname) if $^O eq 'VMS';
+	$::path_to_name{$t} = $tname;
       }
     }
     my $maxlen = 0;
@@ -259,14 +234,11 @@ EOT
     my $good_files = 0;
     my $tested_files  = 0;
     my $totmax = 0;
+    my %failed_tests;
 
-    my $test;
-    while ($test = shift @tests) {
+    while (my $test = shift @tests) {
+        my $test_start_time = $show_elapsed_time ? Time::HiRes::time() : 0;
 
-	if ( $::infinite{$test} && $type eq 'compile' ) {
-	    print STDERR "$test creates infinite loop! Skipping.\n";
-            next;
-	}
 	if ($test =~ /^$/) {
 	    next;
 	}
@@ -291,17 +263,17 @@ EOT
 	# XXX DAPM %OVER not defined anywhere
 	# $test = $OVER{$test} if exists $OVER{$test};
 
- 	open(SCRIPT,"<$test") or die "Can't run $test.\n";
- 	$_ = <SCRIPT>;
- 	close(SCRIPT) unless ($type eq 'deparse');
+	open(SCRIPT,"<",$test) or die "Can't run $test.\n";
+	$_ = <SCRIPT>;
+	close(SCRIPT) unless ($type eq 'deparse');
 	if ($::with_utf16) {
 	    $_ =~ tr/\0//d;
 	}
 	my $switch;
- 	if (/#!.*\bperl.*\s-\w*([tT])/) {
- 	    $switch = qq{"-$1"};
- 	}
- 	else {
+	if (/#!.*\bperl.*\s-\w*([tT])/) {
+	    $switch = qq{"-$1"};
+	}
+	else {
 	    if ($::taintwarn) {
 		# not all tests are expected to pass with this option
 		$switch = '"-t"';
@@ -309,9 +281,8 @@ EOT
 	    else {
 		$switch = '';
 	    }
- 	}
+	}
 
-        my $test_executable; # for 'compile' tests
 	my $file_opts = "";
 	if ($type eq 'deparse') {
 	    # Look for #line directives which change the filename
@@ -333,81 +304,32 @@ EOT
 	    open(RESULTS, $deparse_cmd)
 		or print "can't deparse '$deparse_cmd': $!.\n";
 	}
-	elsif ($type eq 'bytecompile') {
-	    my ($pwd, $null);
-            if( $^O eq 'MSWin32') {
-		$pwd = `cd`;
-		$null = 'nul';
-	    } else {
-		$pwd = `pwd`;
-		$null = '/dev/null';
-	    }
-	    chomp $pwd;
-	    my $perl = $ENV{PERL} || "$pwd/perl";
-	    my $bswitch = "-MO=Bytecode,-H,-TI,-s$pwd/$test,";
-	    $bswitch .= "-TF$test.plc,"
-		if $test =~ m(chdir|pod/|CGI/t/carp|lib/DB);
-	    $bswitch .= "-k,"
-		if $test =~ m(deparse|terse|ext/Storable/t/code);
-	    $bswitch .= "-b,"
-		if $test =~ m(op/getpid);
-	    my $bytecompile_cmd =
-		"$perl $testswitch $switch -I../lib $bswitch". 
-		"-o$test.plc $test 2>$null &&".
-		"$perl $testswitch $switch -I../lib $utf8 $test.plc |";
-	    open(RESULTS,$bytecompile_cmd)
-		or print "can't byte-compile '$bytecompile_cmd': $!.\n";
-	}
 	elsif ($type eq 'perl') {
 	    my $perl = $ENV{PERL} || './perl';
 	    my $redir = $^O eq 'VMS' ? '2>&1' : '';
 	    if ($ENV{PERL_VALGRIND}) {
-		$perl = "valgrind --suppressions=perl.supp --leak-check=yes "
-                               . "--leak-resolution=high --show-reachable=yes "
-                               . "--num-callers=50 --logfile-fd=3 $perl";
+		my $valgrind = $ENV{VALGRIND} // 'valgrind';
+		my $vg_opts = $ENV{VG_OPTS}
+		    //  "--suppressions=perl.supp --leak-check=yes "
+			. "--leak-resolution=high --show-reachable=yes "
+			. "--num-callers=50"; 
+		$perl = "$valgrind --log-fd=3 $vg_opts $perl";
 		$redir = "3>$valgrind_log";
 	    }
 	    my $run = "$perl" . _quote_args("$testswitch $switch $utf8")
 			      . " $test $redir|";
 	    open(RESULTS,$run) or print "can't run '$run': $!.\n";
 	}
-	else {
-	    my $compile_cmd;
-            my $pl2c = "$testswitch -I../lib ../utils/perlcc --testsuite " .
-              # -O9 for good measure, -fcog is broken ATM
-                       "$switch -Wb=-O9,-fno-cog -L .. " .
-                       "-I \".. ../lib/CORE\" $args $utf8 $test -o ";
-
-            if( $^O eq 'MSWin32' ) {
-                $test_executable = "$test.exe";
-                # hopefully unused name...
-                open HACK, "> xweghyz.pl";
-                print HACK <<EOT;
-#!./perl
-
-open HACK, '.\\perl $pl2c $test_executable |';
-# cl.exe prints the name of the .c file on stdout (\%^\$^#)
-while(<HACK>) {m/^\\w+\\.[cC]\$/ && next;print}
-open HACK, '$test_executable |';
-while(<HACK>) {print}
-EOT
-                close HACK;
-                $compile_cmd = 'xweghyz.pl |';
-            }
-            else {
-                $test_executable = "$test.plc";
-                $compile_cmd
-		    = "./perl $pl2c $test_executable && $test_executable |";
-            }
-            unlink $test_executable if -f $test_executable;
-	    open(RESULTS, $compile_cmd)
-		or print "can't compile '$compile_cmd': $!.\n";
-	}
-
-        my $failure;
-        my $next = 0;
-        my $seen_leader = 0;
-        my $seen_ok = 0;
+	# Our environment may force us to use UTF-8, but we can't be sure that
+	# anything we're reading from will be generating (well formed) UTF-8
+	# This may not be the best way - possibly we should unset ${^OPEN} up
+	# top?
+	binmode RESULTS;
+
+	my $failure;
+	my $next = 0;
+	my $seen_leader = 0;
+	my $seen_ok = 0;
 	my $trailing_leader = 0;
 	my $max;
 	my %todo;
@@ -428,10 +350,10 @@ EOT
 			last;
 		    }
 		    $max = $1;
-                    %todo = map { $_ => 1 } split / /, $3 if $3;
+		    %todo = map { $_ => 1 } split / /, $3 if $3;
 		    $totmax += $max;
 		    $tested_files++;
-                    if ($seen_ok) {
+		    if ($seen_ok) {
 			# 1..n appears at end of file
 			$trailing_leader = 1;
 			if ($next != $max) {
@@ -442,10 +364,10 @@ EOT
 		    else {
 			$next = 0;
 		    }
-                    $seen_leader = 1;
+		    $seen_leader = 1;
 		}
 		else {
-		    if (/^(not )?ok (\d+)[^\#]*(\s*\#.*)?/) {
+		    if (/^(not )?ok(?: (\d+))?[^\#]*(\s*\#.*)?/) {
 			unless ($seen_leader) {
 			    unless ($seen_ok) {
 				$next = 0;
@@ -453,8 +375,11 @@ EOT
 			}
 			$seen_ok = 1;
 			$next++;
-			if ($2 == $next) {
-			    my($not, $num, $extra, $istodo) = ($1, $2, $3, 0);
+			my($not, $num, $extra, $istodo) = ($1, $2, $3, 0);
+			$num = $next unless $num;
+
+			if ($num == $next) {
+
 			    # SKIP is essentially the same as TODO for t/TEST
 			    # this still conforms to TAP:
 			    # http://search.cpan.org/dist/Test-Harness/lib/Test/Harness/TAP.pod
@@ -467,14 +392,17 @@ EOT
 			    }
 			}
 			else {
-			    $failure ="FAILED--expected test $next, saw test $2";
+			    $failure ="FAILED--expected test $next, saw test $num";
 			    last;
 			}
-                    }
-                    elsif (/^Bail out!\s*(.*)/i) { # magic words
-                        die "FAILED--Further testing stopped" . ($1 ? ": $1\n" : ".\n");
+		    }
+		    elsif (/^Bail out!\s*(.*)/i) { # magic words
+			die "FAILED--Further testing stopped" . ($1 ? ": $1\n" : ".\n");
 		    }
 		    else {
+			# module tests are allowed extra output,
+			# because Test::Harness allows it
+			next if $test =~ /^\W*(ext|lib)\b/;
 			$failure = "FAILED--unexpected output at test $next";
 			last;
 		    }
@@ -497,7 +425,14 @@ EOT
 		    warn "$0: Failed to open '$valgrind_log': $!\n";
 		}
 	    }
-	    if (@valgrind) {
+	    if ($ENV{VG_OPTS} =~ /cachegrind/) {
+		if (rename $valgrind_log, "$test.valgrind") {
+		    $valgrind++;
+		} else {
+		    warn "$0: Failed to create '$test.valgrind': $!\n";
+		}
+	    }
+	    elsif (@valgrind) {
 		my $leaks = 0;
 		my $errors = 0;
 		for my $i (0..$#valgrind) {
@@ -539,10 +474,6 @@ EOT
 	    rename("perl.3log", $tpp) ||
 		die "rename: perl3.log to $tpp: $!\n";
 	}
-        # test if the compiler compiled something
-        if( $type eq 'compile' && !-e "$test_executable" ) {
-            $failure = "Test did not compile";
-        }
 	if (not defined $failure and $next != $max) {
 	    $failure="FAILED--expected $max tests, saw $next";
 	}
@@ -550,14 +481,21 @@ EOT
 	if (defined $failure) {
 	    print "${te}$failure\n";
 	    $::bad_files++;
-	    $_ = $test;
-	    if (/^base/) {
-		die "Failed a basic test--cannot continue.\n";
+	    if ($test =~ /^base/) {
+		die "Failed a basic test ($test) -- cannot continue.\n";
 	    }
+	    ++$failed_tests{$test};
 	}
 	else {
 	    if ($max) {
-		print "${te}ok\n";
+		my $elapsed;
+		if ( $show_elapsed_time ) {
+		    $elapsed = sprintf( " %8.0f ms", (Time::HiRes::time() - $test_start_time) * 1000 );
+		}
+		else {
+		    $elapsed = "";
+		}
+		print "${te}ok$elapsed\n";
 		$good_files++;
 	    }
 	    else {
@@ -565,7 +503,7 @@ EOT
 		$tested_files -= 1;
 	    }
 	}
-    }
+    } # while tests
 
     if ($::bad_files == 0) {
 	if ($good_files) {
@@ -578,11 +516,10 @@ EOT
     }
     else {
 	my $pct = $tested_files ? sprintf("%.2f", ($tested_files - $::bad_files) / $tested_files * 100) : "0.00";
-	if ($::bad_files == 1) {
-	    warn "Failed 1 test script out of $tested_files, $pct% okay.\n";
-	}
-	else {
-	    warn "Failed $::bad_files test scripts out of $tested_files, $pct% okay.\n";
+	my $s = $::bad_files == 1 ? "" : "s";
+	warn "Failed $::bad_files test$s out of $tested_files, $pct% okay.\n";
+	for my $test ( sort keys %failed_tests ) {
+	    print "\t$test\n";
 	}
 	warn <<'SHRDLU_1';
 ### Since not all tests were successful, you may want to run some of
@@ -594,34 +531,34 @@ SHRDLU_1
 ###   ./perl harness
 ### in the 't' directory since most (>=80%) of the tests succeeded.
 SHRDLU_2
-        if (eval {require Config; import Config; 1}) {
+	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:
 SHRDLU_3
-                if (exists $ENV{$p} && $ENV{$p} ne '') {
+		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
 SHRDLU_4a
-                } else {
+		} 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
 SHRDLU_4b
-                }    
+		}
 		warn <<SHRDLU_5;
 ### for csh-style shells, like tcsh; or for traditional/modern
 ### Bourne-style shells, like bash, ksh, and zsh, respectively.
 SHRDLU_5
-            }
+	    }
 	}
     }
     my ($user,$sys,$cuser,$csys) = times;
-    print sprintf("u=%g  s=%g  cu=%g  cs=%g  scripts=%d  tests=%d\n",
+    print sprintf("u=%.2f  s=%.2f  cu=%.2f  cs=%.2f  scripts=%d  tests=%d\n",
 	$user,$sys,$cuser,$csys,$tested_files,$totmax);
     if ($ENV{PERL_VALGRIND}) {
 	my $s = $valgrind == 1 ? '' : 's';
@@ -629,3 +566,5 @@ SHRDLU_5
     }
 }
 exit ($::bad_files != 0);
+
+# ex: set ts=8 sts=4 sw=4 noet: