svn commit: samba r25465 - in branches/SAMBA_4_0/source/selftest/output: .

[metze at samba.org]

Author: metze
Date: 2007-10-02 15:53:26 +0000 (Tue, 02 Oct 2007)
New Revision: 25465

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25465

Log:
improve plain output...

metze
Modified:
   branches/SAMBA_4_0/source/selftest/output/plain.pm


Changeset:
Modified: branches/SAMBA_4_0/source/selftest/output/plain.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/output/plain.pm	2007-10-02 15:52:23 UTC (rev 25464)
+++ branches/SAMBA_4_0/source/selftest/output/plain.pm	2007-10-02 15:53:26 UTC (rev 25465)
@@ -81,16 +81,21 @@
 sub end_test($$$$$$)
 {
 	my ($self, $state, $testname, $result, $unexpected, $reason) = @_;
+	my $append = "";
 
-	if ($unexpected and $self->{immediate} and not $self->{verbose}) {
-		if ($reason) {
-			print "$testname: $result [ $reason ]\n";
-		} else {
-			print "$testname: $result\n";
-		}
-		print $self->{test_output}->{$state->{NAME}}."\n";
+	unless ($unexpected) {
+		$self->{test_output}->{$state->{NAME}} = "";
+		return;
 	}
-	$self->{test_output}->{$state->{NAME}} = "";
+
+	$append = "UNEXPECTED($result): $testname\n";
+
+	$self->{test_output}->{$state->{NAME}} .= $append;
+
+	if ($self->{immediate} and not $self->{verbose}) {
+		print $self->{test_output}->{$state->{NAME}};
+		$self->{test_output}->{$state->{NAME}} = "";
+	}
 }
 
 sub summary($)