#!/usr/bin/perl
-
+# Plain text output for selftest
+# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
package output::plain;
use Exporter;
@ISA = qw(Exporter);
verbose => $verbose,
immediate => $immediate,
statistics => $statistics,
- start_time => time(),
+ start_time => undef,
test_output => {},
suitesfailed => [],
suites_ok => 0,
bless($self, $class);
}
+sub testsuite_count($$)
+{
+ my ($self, $count) = @_;
+ $self->{totalsuites} = $count;
+}
+
+sub report_time($$)
+{
+ my ($self, $time) = @_;
+ unless ($self->{start_time}) {
+ $self->{start_time} = $time;
+ }
+ $self->{last_time} = $time;
+}
+
sub output_msg($$);
sub start_testsuite($$)
$self->{index}++;
$self->{NAME} = $name;
- $self->{START_TIME} = time();
+ $self->{START_TIME} = $self->{last_time};
my $duration = $self->{START_TIME} - $self->{start_time};
$self->{test_output}->{$name} = "" unless($self->{verbose});
my $out = "";
- $out .= "[$self->{index}/$self->{totalsuites} in ".$duration."s";
+ $out .= "[$self->{index}";
+ if ($self->{totalsuites}) {
+ $out .= "/$self->{totalsuites}";
+ }
+ $out.= " in ".$duration."s";
$out .= sprintf(", %d errors", ($#{$self->{suitesfailed}}+1)) if ($#{$self->{suitesfailed}} > -1);
$out .= "] $name";
if ($self->{immediate}) {
print "$out\n";
} else {
- require Term::ReadKey;
- my ($wchar, $hchar, $wpixels, $hpixels) = Term::ReadKey::GetTerminalSize();
- foreach (1..$wchar) { $out.= " "; }
- print "\r".substr($out, 0, $wchar);
+ print "$out: ";
}
}
require FileHandle;
print $output;
STDOUT->flush();
- } else {
+ } elsif (defined($self->{NAME})) {
$self->{test_output}->{$self->{NAME}} .= $output;
+ } else {
+ print $output;
}
}
{
my ($self, $output) = @_;
- $self->output_msg($output);
+ #$self->output_msg($output);
}
-sub end_testsuite($$$$$)
+sub end_testsuite($$$$)
{
- my ($self, $name, $result, $unexpected, $reason) = @_;
+ my ($self, $name, $result, $reason) = @_;
my $out = "";
+ my $unexpected = 0;
- if ($unexpected) {
- if ($result eq "success" and not defined($reason)) {
- $reason = "Expected negative exit code, got positive exit code";
- }
- $self->output_msg("ERROR: $reason\n");
- push (@{$self->{suitesfailed}}, $name);
- } else {
- $self->{suites_ok}++;
+ if (not defined($self->{test_output}->{$name})) {
+ print "no output for name[$name]\n";
}
- if ($unexpected and $self->{immediate} and not $self->{verbose}) {
- $out .= $self->{test_output}->{$name};
+ if ($result eq "success" or $result eq "xfail") {
+ $self->{suites_ok}++;
+ } else {
+ $self->output_msg("ERROR: Testsuite[$name]\nREASON: $reason\n");
+ push (@{$self->{suitesfailed}}, $name);
+ if ($self->{immediate} and not $self->{verbose}) {
+ $out .= $self->{test_output}->{$name};
+ }
+ $unexpected = 1;
}
+ if (not $self->{immediate}) {
+ unless($unexpected) {
+ $out .= " ok\n";
+ } else {
+ $out .= " " . uc($result) . "\n";
+ }
+ }
print $out;
}
sub start_test($$$)
{
- my ($self, $parents, $testname) = @_;
-
- if ($#$parents == -1) {
- $self->start_testsuite($testname);
- }
+ my ($self, $testname) = @_;
}
sub end_test($$$$$)
{
- my ($self, $parents, $testname, $result, $unexpected, $reason) = @_;
+ my ($self, $testname, $result, $unexpected, $reason) = @_;
- if ($#$parents == -1) {
- $self->end_testsuite($testname, $result, $unexpected, $reason);
- return;
- }
-
my $append = "";
unless ($unexpected) {
$self->{test_output}->{$self->{NAME}} = "";
+ if (not $self->{immediate}) {
+ if ($result eq "failure") { print "f"; }
+ elsif ($result eq "xfail") { print "X"; }
+ elsif ($result eq "skip") { print "s"; }
+ elsif ($result eq "success") { print "."; }
+ else { print "?($result)"; }
+ }
return;
}
- my $fullname = join(".", @$parents).".$testname";
+ chomp $reason;
- $append = "UNEXPECTED($result): $testname ($fullname)\n";
+ $append = "UNEXPECTED($result): $testname\nREASON: $reason\n";
$self->{test_output}->{$self->{NAME}} .= $append;
print $self->{test_output}->{$self->{NAME}};
$self->{test_output}->{$self->{NAME}} = "";
}
+
+ if (not $self->{immediate}) {
+ if ($result eq "error") { print "E"; }
+ elsif ($result eq "failure") { print "F"; }
+ elsif ($result eq "success") { print "S"; }
+ else { print "?"; }
+ }
}
sub summary($)
}
close(SUMMARY);
- print "\nA summary with detailed informations can be found in:\n $self->{summaryfile}\n";
+ print "\nA summary with detailed information can be found in:\n $self->{summaryfile}\n";
if ($#{$self->{suitesfailed}} == -1) {
my $ok = $self->{statistics}->{TESTS_EXPECTED_OK} +
}
-sub skip_testsuite($$)
+sub skip_testsuite($$$)
{
my ($self, $name, $reason) = @_;
+ unless (defined($reason)) {
+ $reason = "UNKNOWN";
+ }
push (@{$self->{skips}->{$reason}}, $name);
- $self->{totalsuites}--;
+ if ($self->{totalsuites}) {
+ $self->{totalsuites}--;
+ }
}
1;