diff options
Diffstat (limited to 'source4/selftest/output/plain.pm')
| -rw-r--r-- | source4/selftest/output/plain.pm | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/source4/selftest/output/plain.pm b/source4/selftest/output/plain.pm index 10d6eee215..e4abb2d05a 100644 --- a/source4/selftest/output/plain.pm +++ b/source4/selftest/output/plain.pm @@ -13,8 +13,7 @@ sub new($$$$) { immediate => $immediate, statistics => $statistics, test_output => {}, - suitesfailed => [], - start => time() + suitesfailed => [] }; bless($self, $class); } @@ -61,6 +60,8 @@ sub end_testsuite($$$$$) my ($self, $state, $expected_ret, $ret, $envlog) = @_; my $out = ""; + $self->output_msg($state, "ENVLOG: $envlog\n") if ($envlog ne ""); + if ($ret != $expected_ret) { $self->output_msg($state, "ERROR: $ret\n"); } @@ -77,9 +78,24 @@ sub start_test($$) my ($state, $testname) = @_; } -sub end_test($$$$$) +sub end_test($$$$$$) { - my ($state, $testname, $result, $unexpected, $reason) = @_; + my ($self, $state, $testname, $result, $unexpected, $reason) = @_; + my $append = ""; + + 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}} = ""; + } } sub summary($) @@ -111,11 +127,15 @@ sub missing_env($$$) print "FAIL: $name (ENV[$envname] not available!)\n"; } -sub skip_testsuite($$) +sub skip_testsuite($$$) { - my ($self, $name) = @_; + my ($self, $envname, $name, $reason) = @_; - print "SKIPPED: $name\n"; + if ($reason) { + print "SKIPPED: $name [$reason]\n"; + } else { + print "SKIPPED: $name\n"; + } } 1; |