my $seen_ok = 0;
my $trailing_leader = 0;
my $max;
+ my %todo;
while (<RESULTS>) {
next if /^\s*$/; # skip blank lines
if ($::verbose) {
print $_;
}
unless (/^\#/) {
- my %todo;
if ($trailing_leader) {
# shouldn't be anything following a postfix 1..n
- $failure = 'extra output after trailing 1..n';
+ $failure = 'FAILED--extra output after trailing 1..n';
last;
}
if (/^1\.\.([0-9]+)( todo ([\d ]+))?/) {
if ($seen_leader) {
- $failure = 'seen duplicate leader';
+ $failure = 'FAILED--seen duplicate leader';
last;
}
$max = $1;
# 1..n appears at end of file
$trailing_leader = 1;
if ($next != $max) {
- $failure = "expected $max tests, saw $next";
+ $failure = "FAILED--expected $max tests, saw $next";
last;
}
}
}
}
else {
- $failure ="expected test $next, saw test $2";
+ $failure ="FAILED--expected test $next, saw test $2";
last;
}
}
die "FAILED--Further testing stopped" . ($1 ? ": $1\n" : ".\n");
}
else {
- $failure = "Unexpected output at test $next";
+ $failure = "FAILED--unexpected output at test $next";
last;
}
}
close RESULTS;
if (not defined $failure) {
- $failure = 'no leader found' unless $seen_leader;
+ $failure = 'FAILED--no leader found' unless $seen_leader;
}
if ($ENV{PERL_VALGRIND}) {
$failure = "Test did not compile";
}
if (not defined $failure and $next != $max) {
- $failure="expected $max tests, saw $next";
+ $failure="FAILED--expected $max tests, saw $next";
}
if (defined $failure) {
}
}
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';