r25465: improve plain output...

metze

diff --git a/source/selftest/output/plain.pm b/source/selftest/output/plain.pm
index 12236e518fcfeb6a6b3462920fd3c166e26cba0a..e4abb2d05aadbc2f61bb20a52580c31c2ac2b15d 100644 (file)
--- a/source/selftest/output/plain.pm
+++ b/source/selftest/output/plain.pm
@@ -81,16 +81,21 @@ sub start_test($$)
 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;
+       }
+
+       $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}} = "";
        }
-       $self->{test_output}->{$state->{NAME}} = "";
 }
 
 sub summary($)