summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-08-26 20:14:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:02:39 -0500
commit90870011435a09e806767b555f178e17b1b4c313 (patch)
tree6207ba8dbab7b770797c49d17fafcb46214708aa
parent91c46fefa112a4bb526a8bf2925fa0f499b6d821 (diff)
downloadsamba-90870011435a09e806767b555f178e17b1b4c313.tar.gz
samba-90870011435a09e806767b555f178e17b1b4c313.tar.bz2
samba-90870011435a09e806767b555f178e17b1b4c313.zip
r24678: More improvements to html output; list unexpected successes and failures seperately from expected ones.
(This used to be commit 14fda5260d49a89d7e74302958fe27b73415e6a1)
-rw-r--r--source4/selftest/output/html.pm14
1 files changed, 8 insertions, 6 deletions
diff --git a/source4/selftest/output/html.pm b/source4/selftest/output/html.pm
index afbe63177a..3b95a3d9b8 100644
--- a/source4/selftest/output/html.pm
+++ b/source4/selftest/output/html.pm
@@ -199,17 +199,16 @@ sub summary($)
} else {
print INDEX " <td class=\"resultFailure\">";
}
- print INDEX "$st->{TESTS_EXPECTED_OK} ok";
+ print INDEX ($st->{TESTS_EXPECTED_OK} + $st->{TESTS_UNEXPECTED_OK}) + " ok";
if ($st->{TESTS_UNEXPECTED_OK} > 0) {
- print INDEX " ($st->{TESTS_UNEXPECTED_OK})";
+ print INDEX " ($st->{TESTS_UNEXPECTED_OK} unexpected)";
}
- print INDEX "</td>";
if ($st->{TESTS_SKIP} > 0) {
print INDEX ", $st->{TESTS_SKIP} skipped";
}
- print INDEX ", $st->{TESTS_EXPECTED_FAIL} failures";
+ print INDEX ", " . ($st->{TESTS_UNEXPECTED_FAIL} + $st->{TESTS_EXPECTED_FAIL}) . " failures";
if ($st->{TESTS_UNEXPECTED_OK} > 0) {
- print INDEX " ($st->{TESTS_UNEXPECTED_FAIL})";
+ print INDEX " ($st->{TESTS_EXPECTED_FAIL} expected)";
}
if ($st->{TESTS_ERROR} > 0) {
print INDEX ", $st->{TESTS_ERROR} errors";
@@ -232,7 +231,10 @@ sub missing_env($$$)
{
my ($self, $name, $envname) = @_;
- print "FAIL: $name (ENV[$envname] not available!)\n";
+ print INDEX "<tr>\n";
+ print INDEX " <td class=\"testSuite\">$name</td>\n";
+ print INDEX " <td class=\"resultSkipped\" colspan=\"2\">SKIPPED - environment `$envname` not available!</td>\n";
+ print INDEX "</tr>\n";
}
sub skip_testsuite($$)