diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-10-02 15:53:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:41 -0500 |
| commit | 00d2a195547f639b631f95431edc1484a0acd9de (patch) | |
| tree | 3d7f07502cbf09b8dc5d2513879c63483a5891f2 /source4 | |
| parent | f069623aceeb74b4e19abc4e81f899f6ada390e5 (diff) | |
| download | samba-00d2a195547f639b631f95431edc1484a0acd9de.tar.gz samba-00d2a195547f639b631f95431edc1484a0acd9de.tar.bz2 samba-00d2a195547f639b631f95431edc1484a0acd9de.zip | |
r25465: improve plain output...
metze
(This used to be commit 8deb2f068c7574618467859d9335fbd1ca6e49a1)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/selftest/output/plain.pm | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/source4/selftest/output/plain.pm b/source4/selftest/output/plain.pm index 12236e518f..e4abb2d05a 100644 --- a/source4/selftest/output/plain.pm +++ b/source4/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($) |