strictify t/TEST

make most variables lexical, narrow their scope, and give some of
them more meaningful names. Also fix a harmless bug where the wrong
filehandles are closed (A+B rather than U+A)

p4raw-id: //depot/perl@24389

1 files changed, 88 insertions, 76 deletions

diff --git a/t/TEST b/t/TEST
index d60b4f62da..7dd688d984 100755
--- a/t/TEST
+++ b/t/TEST
@@ -7,6 +7,10 @@
 
 $| = 1;
 
+# for testing TEST only
+#BEGIN { require '../lib/strict.pm'; strict->import() };
+#BEGIN { require '../lib/warnings.pm'; warnings->import() };
+
 # Let tests know they're running in the perl core.  Useful for modules
 # which live dual lives on CPAN.
 $ENV{PERL_CORE} = 1;
@@ -15,26 +19,26 @@ $ENV{PERL_CORE} = 1;
 @ARGV = grep($_,@ARGV) if $^O eq 'VMS';
 
 # Cheesy version of Getopt::Std.  Maybe we should replace it with that.
-@argv = ();
-if ($#ARGV >= 0) {
+{
+    my @argv = ();
     foreach my $idx (0..$#ARGV) {
 	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_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';
+	$::core    = 1 if $1 eq 'core';
+	$::verbose = 1 if $1 eq 'v';
+	$::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(,.+)?$/) {
-	    $deparse = 1;
-	    $deparse_opts = $1;
+	    $::deparse = 1;
+	    $::deparse_opts = $1;
 	}
     }
+    @ARGV = @argv;
 }
-@ARGV = @argv;
 
 chdir 't' if -f 't/TEST';
 
@@ -103,7 +107,7 @@ unless (@ARGV) {
     foreach my $dir (qw(base comp cmd run io op uni)) {
         _find_tests($dir);
     }
-    _find_tests("lib") unless $core;
+    _find_tests("lib") unless $::core;
     # Config.pm may be broken for make minitest. And this is only a refinement
     # for skipping tests on non-default builds, so it is allowed to fail.
     # What we want to to is make a list of extensions which we did not build.
@@ -138,18 +142,18 @@ unless (@ARGV) {
     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!) {
-		$t = $1;
-		$extension = $2;
-		if (!$core || $t =~ m!^lib/[a-z]!)
+		my $t = $1;
+		my $extension = $2;
+		if (!$::core || $t =~ m!^lib/[a-z]!)
 		{
 		    if (defined $extension) {
 			$extension =~ s!/t$!!;
 			# XXX Do I want to warn that I'm skipping these?
 			next if $skip{$extension};
 		    }
-		    $path = File::Spec->catfile($updir, $t);
+		    my $path = File::Spec->catfile($updir, $t);
 		    push @ARGV, $path;
-		    $name{$path} = $t;
+		    $::path_to_name{$path} = $t;
 		}
 	    }
 	}
@@ -157,27 +161,27 @@ unless (@ARGV) {
     } else {
         warn "$0: cannot open $mani: $!\n";
     }
-    unless ($core) {
+    unless ($::core) {
 	_find_tests('pod');
 	_find_tests('x2p');
-	_find_tests('japh') if $torture;
+	_find_tests('japh') if $::torture;
     }
 }
 
 # Tests known to cause infinite loops for the perlcc tests.
-# %infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 );
-%infinite = ();
+# %::infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 );
+%::infinite = ();
 
-if ($deparse) {
+if ($::deparse) {
     _testprogs('deparse', '',   @ARGV);
 }
-elsif( $compile ) { 
+elsif( $::compile ) { 
     _testprogs('compile', '',   @ARGV);
 }
-elsif( $bytecompile ) {
+elsif( $::bytecompile ) {
     _testprogs('bytecompile', '', @ARGV);
 }
-elsif ($with_utf16) {
+elsif ($::with_utf16) {
     for my $e (0, 1) {
 	for my $b (0, 1) {
 	    print STDERR "# ENDIAN $e BOM $b\n";
@@ -193,9 +197,9 @@ elsif ($with_utf16) {
 			while (<A>) {
 			    print U pack("$f*", unpack("C*", $_));
 			}
-			close(A);
+			close(U);
 		    }
-		    close(B);
+		    close(A);
 		}
 	    }
 	    _testprogs('perl', '', @UARGV);
@@ -209,9 +213,7 @@ else {
 }
 
 sub _testprogs {
-    $type = shift @_;
-    $args = shift;
-    @tests = @_;
+    my ($type, $args, @tests) = @_;
 
     print <<'EOT' if ($type eq 'compile');
 ------------------------------------------------------------------------------
@@ -234,32 +236,35 @@ EOT
     $ENV{PERLCC_TIMEOUT} = 120
           if ($type eq 'compile' && !$ENV{PERLCC_TIMEOUT});
 
-    $bad = 0;
-    $good = 0;
-    $total = @tests;
-    $files  = 0;
-    $totmax = 0;
+    $::bad_files = 0;
 
     foreach my $t (@tests) {
-      unless (exists $name{$t}) {
+      unless (exists $::path_to_name{$t}) {
         my $tname = File::Spec->catfile('t',$t);
         $tname = VMS::Filespec::unixify($tname) if $^O eq 'VMS';
-        $name{$t} = $tname;
+        $::path_to_name{$t} = $tname;
       }
     }
     my $maxlen = 0;
-    foreach (@name{@tests}) {
+    foreach (@::path_to_name{@tests}) {
 	s/\.\w+\z/./;
 	my $len = length ;
 	$maxlen = $len if $len > $maxlen;
     }
     # + 3 : we want three dots between the test name and the "ok"
-    $dotdotdot = $maxlen + 3 ;
+    my $dotdotdot = $maxlen + 3 ;
     my $valgrind = 0;
     my $valgrind_log = 'current.valgrind';
+    my $total_files = @tests;
+    my $good_files = 0;
+    my $tested_files  = 0;
+    my $totmax = 0;
+    my $ok;
+
+    my $test;
     while ($test = shift @tests) {
 
-	if ( $infinite{$test} && $type eq 'compile' ) {
+	if ( $::infinite{$test} && $type eq 'compile' ) {
 	    print STDERR "$test creates infinite loop! Skipping.\n";
             next;
 	}
@@ -276,26 +281,29 @@ EOT
 		next;
 	    }
 	}
-	$te = $name{$test} . '.' x ($dotdotdot - length($name{$test}));
+	my $te = $::path_to_name{$test} . '.'
+		    x ($dotdotdot - length($::path_to_name{$test}));
 
 	if ($^O ne 'VMS') {  # defer printing on VMS due to piping bug
 	    print $te;
 	    $te = '';
 	}
 
-	$test = $OVER{$test} if exists $OVER{$test};
+	# 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');
-	if ($with_utf16) {
+	if ($::with_utf16) {
 	    $_ =~ tr/\0//d;
 	}
+	my $switch;
  	if (/#!.*\bperl.*\s-\w*([tT])/) {
  	    $switch = qq{"-$1"};
  	}
  	else {
-	    if ($taintwarn) {
+	    if ($::taintwarn) {
 		# not all tests are expected to pass with this option
 		$switch = '"-t"';
 	    }
@@ -315,16 +323,16 @@ EOT
 	    close(SCRIPT);
 	}
 
-	my $utf8 = $with_utf8 ? '-I../lib -Mutf8' : '';
+	my $utf8 = $::with_utf8 ? '-I../lib -Mutf8' : '';
 	my $testswitch = '-I. -MTestInit'; # -T will strict . from @INC
 	if ($type eq 'deparse') {
-	    my $deparse =
+	    my $deparse_cmd =
 		"./perl $testswitch $switch -I../lib -MO=-qq,Deparse,-sv1.,".
-		"-l$deparse_opts$file_opts ".
+		"-l$::deparse_opts$file_opts ".
 		"$test > $test.dp ".
 		"&& ./perl $testswitch $switch -I../lib $test.dp |";
-	    open(RESULTS, $deparse)
-		or print "can't deparse '$deparse': $!.\n";
+	    open(RESULTS, $deparse_cmd)
+		or print "can't deparse '$deparse_cmd': $!.\n";
 	}
 	elsif ($type eq 'bytecompile') {
 	    my ($pwd, $null);
@@ -344,12 +352,12 @@ EOT
 		if $test =~ m(deparse|terse|ext/Storable/t/code);
 	    $bswitch .= "-b,"
 		if $test =~ m(op/getpid);
-	    my $bytecompile =
+	    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)
-		or print "can't byte-compile '$bytecompile': $!.\n";
+	    open(RESULTS,$bytecompile_cmd)
+		or print "can't byte-compile '$bytecompile_cmd': $!.\n";
 	}
 	elsif ($type eq 'perl') {
 	    my $perl = $ENV{PERL} || './perl';
@@ -360,11 +368,12 @@ EOT
                                . "--num-callers=50 --logfile-fd=3 $perl";
 		$redir = "3>$valgrind_log";
 	    }
-	    my $run = "$perl" . _quote_args("$testswitch $switch $utf8") . " $test $redir|";
+	    my $run = "$perl" . _quote_args("$testswitch $switch $utf8")
+			      . " $test $redir|";
 	    open(RESULTS,$run) or print "can't run '$run': $!.\n";
 	}
 	else {
-	    my $compile;
+	    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 .. " .
@@ -384,32 +393,35 @@ open HACK, '$test_executable |';
 while(<HACK>) {print}
 EOT
                 close HACK;
-                $compile = 'xweghyz.pl |';
+                $compile_cmd = 'xweghyz.pl |';
             }
             else {
                 $test_executable = "$test.plc";
-                $compile = "./perl $pl2c $test_executable && $test_executable |";
+                $compile_cmd
+		    = "./perl $pl2c $test_executable && $test_executable |";
             }
             unlink $test_executable if -f $test_executable;
-	    open(RESULTS, $compile)
-		or print "can't compile '$compile': $!.\n";
+	    open(RESULTS, $compile_cmd)
+		or print "can't compile '$compile_cmd': $!.\n";
 	}
 
         $ok = 0;
-        $next = 0;
+        my $next = 0;
         my $seen_leader = 0;
         my $seen_ok = 0;
+	my $max;
 	while (<RESULTS>) {
 	    next if /^\s*$/; # skip blank lines
-	    if ($verbose) {
+	    if ($::verbose) {
 		print $_;
 	    }
 	    unless (/^\#/) {
+		my %todo;
 		if (/^1\.\.([0-9]+)( todo ([\d ]+))?/) {
 		    $max = $1;
                     %todo = map { $_ => 1 } split / /, $3 if $3;
 		    $totmax += $max;
-		    $files += 1;
+		    $tested_files++;
                     unless ($seen_ok) {
                       $next = 1;
                       $ok = 1;
@@ -514,11 +526,11 @@ EOT
 	if ($ok && $next == $max ) {
 	    if ($max) {
 		print "${te}ok\n";
-		$good = $good + 1;
+		$good_files++;
 	    }
 	    else {
 		print "${te}skipping test on this platform\n";
-		$files -= 1;
+		$tested_files -= 1;
 	    }
 	}
 	else {
@@ -529,7 +541,7 @@ EOT
 	    else {
 		print "${te}FAILED at test $next\n";
 	    }
-	    $bad = $bad + 1;
+	    $::bad_files++;
 	    $_ = $test;
 	    if (/^base/) {
 		die "Failed a basic test--cannot continue.\n";
@@ -537,7 +549,7 @@ EOT
 	}
     }
 
-    if ($bad == 0) {
+    if ($::bad_files == 0) {
 	if ($ok) {
 	    print "All tests successful.\n";
 	    # XXX add mention of 'perlbug -ok' ?
@@ -547,25 +559,25 @@ EOT
 	}
     }
     else {
-	$pct = $files ? sprintf("%.2f", ($files - $bad) / $files * 100) : "0.00";
-	if ($bad == 1) {
-	    warn "Failed 1 test script out of $files, $pct% okay.\n";
+	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 test scripts out of $files, $pct% okay.\n";
+	    warn "Failed $::bad_files test scripts out of $tested_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".
 SHRDLU_1
-	warn <<'SHRDLU_2' if $good / $total > 0.8;
+	warn <<'SHRDLU_2' if $good_files / $total_files > 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.
 SHRDLU_2
         if (eval {require Config; import Config; 1}) {
-	    if ($Config{usedl} && (my $p = $Config{ldlibpthname})) {
+	    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:
@@ -590,12 +602,12 @@ SHRDLU_5
             }
 	}
     }
-    ($user,$sys,$cuser,$csys) = times;
+    my ($user,$sys,$cuser,$csys) = times;
     print sprintf("u=%g  s=%g  cu=%g  cs=%g  scripts=%d  tests=%d\n",
-	$user,$sys,$cuser,$csys,$files,$totmax);
+	$user,$sys,$cuser,$csys,$tested_files,$totmax);
     if ($ENV{PERL_VALGRIND}) {
 	my $s = $valgrind == 1 ? '' : 's';
 	print "$valgrind valgrind report$s created.\n", ;
     }
 }
-exit ($bad != 0);
+exit ($::bad_files != 0);