Deparse: Emit package before use

[perl5.git] / t / TEST

diff --git a/t/TEST b/t/TEST
index c61cda2..7c26372 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -1,4 +1,4 @@
-#!./perl -w
+#!./perl
 
 # This is written in a peculiar style, since we're trying to avoid
 # most of the constructs we'll be testing for.  (This comment is
@@ -14,6 +14,9 @@
 # In which case, we need to stop t/TEST actually running tests, as all
 # t/harness needs are its subroutines.
 
+# Measure the elapsed wallclock time.
+my $t0 = time();
+
 # If we're doing deparse tests, ignore failures for these
 my $deparse_failures;
 
@@ -107,6 +110,11 @@ my %skip = (
            '.svn' => 1,
           );
 
+
+if ($::do_nothing) {
+    return 1;
+}
+
 $| = 1;
 
 # for testing TEST only
@@ -117,12 +125,6 @@ $| = 1;
 @ARGV = grep($_,@ARGV) if $^O eq 'VMS';
 our $show_elapsed_time = $ENV{HARNESS_TIMER} || 0;
 
-{   # create timestamp for any reports written, so theyre corelatable
-    my @dt = localtime;
-    $dt[5] += 1900; $dt[4] += 1; # fix year, month
-    $::tstamp = sprintf("%d-%.2d%.2d-%.2d%.2d-%.2d-$$", @dt[5,4,3,2,1,0]);
-}
-
 # Cheesy version of Getopt::Std.  We can't replace it with that, because we
 # can't rely on require working.
 {
@@ -145,10 +147,6 @@ our $show_elapsed_time = $ENV{HARNESS_TIMER} || 0;
     @ARGV = @argv;
 }
 
-if ($::do_nothing || $::do_nothing) { # set by harness b4 requiring us
-    return 1;
-}
-
 chdir 't' if -f 't/TEST';
 if (-f 'TEST' && -f 'harness' && -d '../lib') {
     @INC = '../lib';
@@ -168,8 +166,7 @@ if ($show_elapsed_time) { require Time::HiRes }
 my %timings = (); # testname => [@et] pairs if $show_elapsed_time.
 
 # Roll your own File::Find!
-our @found;
-sub _find_tests { @found = (); push @ARGV, _find_files('\.t$', $_[0]) }
+sub _find_tests { our @found=(); push @ARGV, _find_files('\.t$', $_[0]) }
 sub _find_files {
     my($patt, @dirs) = @_;
     for my $dir (@dirs) {
@@ -536,7 +533,7 @@ EOT
     my $grind_ct = 0;          # count of non-empty valgrind reports
     my $total_files = @tests;
     my $good_files = 0;
-    my $tested_files = 0;
+    my $tested_files  = 0;
     my $totmax = 0;
     my %failed_tests;
     my $toolnm;                # valgrind, cachegrind, perf
@@ -572,12 +569,12 @@ EOT
 
        my $results = _run_test($test, $type);
 
-       my $failure = "";
-       my $next = 0;                   # ++ after each ok M
-       my $seen_leader = 0;            # set after "1..N"
-       my $seen_ok = 0;                # set after "ok M"
-       my $trailing_leader = 0;        # set after "1..N" if $seen_ok
-       my $max;                        # set to N after "1..N"
+       my $failure;
+       my $next = 0;
+       my $seen_leader = 0;
+       my $seen_ok = 0;
+       my $trailing_leader = 0;
+       my $max;
        my %todo;
        while (<$results>) {
            next if /^\s*$/; # skip blank lines
@@ -665,7 +662,7 @@ EOT
        }
        close $results;
 
-       if (not $failure) {
+       if (not defined $failure) {
            $failure = 'FAILED--no leader found' unless $seen_leader;
        }
 
@@ -674,11 +671,13 @@ EOT
        if ($type eq 'deparse' && !$ENV{KEEP_DEPARSE_FILES}) {
            unlink "./$test.dp";
        }
-       if (not $failure and $next != $max) {
+       if (not defined $failure and $next != $max) {
            $failure="FAILED--expected $max tests, saw $next";
        }
 
-       if (not $failure and $? ) {     # don't mask a test failure
+       if( !defined $failure  # don't mask a test failure
+           and $? )
+       {
            $failure = "FAILED--non-zero wait status: $?";
        }
 
@@ -695,7 +694,7 @@ EOT
            }
        }
 
-       if ($failure) {
+       if (defined $failure) {
            print "${te}$failure\n";
            $::bad_files = $::bad_files + 1;
            if ($test =~ /^base/ && ! defined &DynaLoader::boot_DynaLoader) {
@@ -782,6 +781,7 @@ SHRDLU_5
            }
        }
     }
+    printf "Elapsed: %d sec\n", time() - $t0;
     my ($user,$sys,$cuser,$csys) = times;
     my $tot = sprintf("u=%.2f  s=%.2f  cu=%.2f  cs=%.2f  scripts=%d  tests=%d",
                      $user,$sys,$cuser,$csys,$tested_files,$totmax);
@@ -793,7 +793,9 @@ SHRDLU_5
            # relative path must account for that, ie ../../perf
            # points to dir next to source tree.
            require Storable;
-           my $fn = "$show_elapsed_time/$::tstamp.ttimes";
+           my @dt = localtime;
+           $dt[5] += 1900; $dt[4] += 1; # fix year, month
+           my $fn = "$show_elapsed_time/".join('-', @dt[5,4,3,2,1]).".ttimes";
            Storable::store({ perf => \%timings,
                              gather_conf_platform_info(),
                              total => $tot,