Move selftest code to top-level.

1 files changed, 195 insertions, 0 deletions

diff --git a/selftest/output/plain.pm b/selftest/output/plain.pm
new file mode 100644
index 0000000000..4bec4e0fdc
--- /dev/null
+++ b/selftest/output/plain.pm
@@ -0,0 +1,195 @@
+#!/usr/bin/perl
+
+package output::plain;
+use Exporter;
+@ISA = qw(Exporter);
+
+use FindBin qw($RealBin);
+use lib "$RealBin/..";
+
+use strict;
+
+sub new($$$$$$$) {
+	my ($class, $summaryfile, $verbose, $immediate, $statistics, $totaltests) = @_;
+	my $self = { 
+		verbose => $verbose, 
+		immediate => $immediate, 
+		statistics => $statistics,
+		start_time => time(),
+		test_output => {},
+		suitesfailed => [],
+		suites_ok => 0,
+		skips => {},
+		summaryfile => $summaryfile,
+		index => 0,
+		totalsuites => $totaltests,
+	};
+	bless($self, $class);
+}
+
+sub output_msg($$);
+
+sub start_testsuite($$)
+{
+	my ($self, $name) = @_;
+
+	$self->{index}++;
+	$self->{NAME} = $name;
+	$self->{START_TIME} = 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 .= 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);
+	}
+}
+
+sub output_msg($$)
+{
+	my ($self, $output) = @_;
+
+	if ($self->{verbose}) {
+		require FileHandle;
+		print $output;
+		STDOUT->flush();
+	} else {
+		$self->{test_output}->{$self->{NAME}} .= $output;
+	}
+}
+
+sub control_msg($$)
+{
+	my ($self, $output) = @_;
+
+	$self->output_msg($output);
+}
+
+sub end_testsuite($$$$$)
+{
+	my ($self, $name, $result, $unexpected, $reason) = @_;
+	my $out = "";
+
+	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 ($unexpected and $self->{immediate} and not $self->{verbose}) {
+		$out .= $self->{test_output}->{$name};
+	}
+
+
+	print $out;
+}
+
+sub start_test($$$)
+{
+	my ($self, $parents, $testname) = @_;
+
+	if ($#$parents == -1) {
+		$self->start_testsuite($testname);
+	}
+}
+
+sub end_test($$$$$)
+{
+	my ($self, $parents, $testname, $result, $unexpected, $reason) = @_;
+	
+	if ($#$parents == -1) {
+		$self->end_testsuite($testname, $result, $unexpected, $reason);
+		return;
+	}
+
+	my $append = "";
+
+	unless ($unexpected) {
+		$self->{test_output}->{$self->{NAME}} = "";
+		return;
+	}
+
+	my $fullname = join(".", @$parents).".$testname";
+
+	$append = "UNEXPECTED($result): $testname ($fullname)\n";
+
+	$self->{test_output}->{$self->{NAME}} .= $append;
+
+	if ($self->{immediate} and not $self->{verbose}) {
+		print $self->{test_output}->{$self->{NAME}};
+		$self->{test_output}->{$self->{NAME}} = "";
+	}
+}
+
+sub summary($)
+{
+	my ($self) = @_;
+
+	open(SUMMARY, ">$self->{summaryfile}");
+
+	if ($#{$self->{suitesfailed}} > -1) {
+		print SUMMARY "= Failed tests =\n";
+
+		foreach (@{$self->{suitesfailed}}) {
+			print SUMMARY "== $_ ==\n";
+			print SUMMARY $self->{test_output}->{$_}."\n\n";
+		}
+
+		print SUMMARY "\n";
+	}
+
+	if (not $self->{immediate} and not $self->{verbose}) {
+		foreach (@{$self->{suitesfailed}}) {
+			print "===============================================================================\n";
+			print "FAIL: $_\n";
+			print $self->{test_output}->{$_};
+			print "\n";
+		}
+	}
+
+	print SUMMARY "= Skipped tests =\n";
+	foreach my $reason (keys %{$self->{skips}}) {
+		print SUMMARY "$reason\n";
+		foreach my $name (@{$self->{skips}->{$reason}}) {
+			print SUMMARY "\t$name\n";
+		}
+		print SUMMARY "\n";
+	}
+	close(SUMMARY);
+
+	print "\nA summary with detailed informations can be found in:\n  $self->{summaryfile}\n";
+
+	if ($#{$self->{suitesfailed}} == -1) {
+		my $ok = $self->{statistics}->{TESTS_EXPECTED_OK} + 
+				 $self->{statistics}->{TESTS_EXPECTED_FAIL};
+		print "\nALL OK ($ok tests in $self->{suites_ok} testsuites)\n";
+	} else {
+		print "\nFAILED ($self->{statistics}->{TESTS_UNEXPECTED_FAIL} failures and $self->{statistics}->{TESTS_ERROR} errors in ". ($#{$self->{suitesfailed}}+1) ." testsuites)\n";
+	}
+
+}
+
+sub skip_testsuite($$)
+{
+	my ($self, $name, $reason) = @_;
+
+	push (@{$self->{skips}->{$reason}}, $name);
+
+	$self->{totalsuites}--;
+}
+
+1;