summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-26 23:36:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:18 -0500
commit79e59dfdf278ce9beb751c3b4a69fe88181649d0 (patch)
tree6b2abb26a144f6ea96ed4af5d295f0f5af7ba8a9
parent966f35a6c878e35f13e7d1920c65ca88bac5ea96 (diff)
downloadsamba-79e59dfdf278ce9beb751c3b4a69fe88181649d0.tar.gz
samba-79e59dfdf278ce9beb751c3b4a69fe88181649d0.tar.bz2
samba-79e59dfdf278ce9beb751c3b4a69fe88181649d0.zip
r25364: List skipped testsuites in summary only.
(This used to be commit cc22be4530f56d8cb862ccf91f386dd587bf9536)
-rw-r--r--source4/selftest/output/html.pm33
1 files changed, 24 insertions, 9 deletions
diff --git a/source4/selftest/output/html.pm b/source4/selftest/output/html.pm
index c96e3e5c5f..22488576b4 100644
--- a/source4/selftest/output/html.pm
+++ b/source4/selftest/output/html.pm
@@ -23,6 +23,7 @@ sub new($$$$) {
unexpected_success => [],
expected_failure => [],
unexpected_failure => [],
+ skip_testsuites => [],
error => []
}
};
@@ -325,6 +326,27 @@ sub summary($)
print_table("Unexpected failures", $summ->{unexpected_failure});
print_table("Skipped tests", $summ->{skip});
print_table("Expected failures", $summ->{expected_failure});
+
+ print SUMMARY "<h3>Skipped testsuites</h3>\n";
+ print SUMMARY "<table>\n";
+ print SUMMARY "<tr>\n";
+ print SUMMARY " <td class=\"tableHead\">Testsuite</td>\n";
+ print SUMMARY " <td class=\"tableHead\">Reason</td>\n";
+ print SUMMARY "</tr>\n";
+
+ foreach (@{$summ->{skip_testsuites}}) {
+ print SUMMARY "<tr>\n";
+ print SUMMARY " <td>$$_[1]</td>\n";
+ if (defined($$_[2])) {
+ print SUMMARY " <td>$$_[2]</td>\n";
+ } else {
+ print SUMMARY " <td></td>\n";
+ }
+ print SUMMARY "</tr>\n";
+ }
+
+ print SUMMARY "</table>";
+
$self->print_html_footer(*SUMMARY);
close(SUMMARY);
}
@@ -340,15 +362,8 @@ sub skip_testsuite($$$$)
{
my ($self, $envname, $name, $reason) = @_;
- print INDEX "<tr>\n";
- print INDEX " <td class=\"testSuite\">$name</td>\n";
- print INDEX " <td class=\"environment\">$envname</td>\n";
- if ($reason) {
- print INDEX " <td class=\"resultSkipped\">SKIPPED - $reason</td>\n";
- } else {
- print INDEX " <td class=\"resultSkipped\">SKIPPED</td>\n";
- }
- print INDEX "</tr>\n";
+ push (@{$self->{error_summary}->{skip_testsuites}},
+ [$envname, $name, $reason]);
}
1;