diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-20 15:54:02 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 06:28:47 +0100 |
commit | 254f1c6fee18dd14d2f9f97d65e6fe9ef04c26f2 (patch) | |
tree | 2c298314e59ed3db7e3dbecb6c66e465800e9afb /source4/selftest/output/html.pm | |
parent | 9ca5a267466f7b1b83a906b1f3b8b1b953222f21 (diff) | |
download | samba-254f1c6fee18dd14d2f9f97d65e6fe9ef04c26f2.tar.gz samba-254f1c6fee18dd14d2f9f97d65e6fe9ef04c26f2.tar.bz2 samba-254f1c6fee18dd14d2f9f97d65e6fe9ef04c26f2.zip |
r26547: Make testsuites less special during subunit handling.
(This used to be commit 0bf6bdcd7f21740853ae852193d51bdf14201782)
Diffstat (limited to 'source4/selftest/output/html.pm')
-rw-r--r-- | source4/selftest/output/html.pm | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/source4/selftest/output/html.pm b/source4/selftest/output/html.pm index fc034cc95f..7f3cfac8cd 100644 --- a/source4/selftest/output/html.pm +++ b/source4/selftest/output/html.pm @@ -136,7 +136,7 @@ sub output_msg($$$) sub end_testsuite($$$$$) { - my ($self, $name, $state, $expected_ret, $ret, $envlog) = @_; + my ($self, $name, $state, $result, $unexpected, $reason) = @_; print TEST "</table>\n"; @@ -151,8 +151,8 @@ sub end_testsuite($$$$$) print INDEX " <td class=\"testSuite\"><a href=\"$state->{HTMLFILE}\">$name</a></td>\n"; my $st = $self->{local_statistics}; - if ($ret == $expected_ret) { - if ($ret == 0) { + if (not $unexpected) { + if ($result eq "failure") { print INDEX " <td class=\"resultExpectedFailure\">"; } else { print INDEX " <td class=\"resultOk\">"; @@ -183,7 +183,7 @@ sub end_testsuite($$$$$) } if ($l == 0) { - if ($ret == $expected_ret) { + if (not $unexpected) { print INDEX "OK"; } else { print INDEX "FAIL"; @@ -197,15 +197,25 @@ sub end_testsuite($$$$$) sub start_test($$$) { - my ($self, $state, $testname) = @_; + my ($self, $state, $parents, $testname) = @_; + + if ($#$parents == -1) { + $self->start_testsuite($testname, $state); + return; + } $self->{active_test} = $testname; $self->{msg} = ""; } -sub end_test($$$$$$) +sub end_test($$$$$$$) { - my ($self, $state, $testname, $result, $unexpected, $reason) = @_; + my ($self, $state, $parents, $testname, $result, $unexpected, $reason) = @_; + + if ($#$parents == -1) { + $self->end_testsuite($testname, $state, $result, $unexpected, $reason); + return; + } print TEST "<tr>"; |