Author: jelmer Date: 2007-08-26 20:14:28 +0000 (Sun, 26 Aug 2007) New Revision: 24678
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24678 Log: More improvements to html output; list unexpected successes and failures seperately from expected ones. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/selftest/output/html.pm Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/selftest/output/html.pm =================================================================== --- branches/SAMBA_4_0/source/selftest/output/html.pm 2007-08-26 20:07:12 UTC (rev 24677) +++ branches/SAMBA_4_0/source/selftest/output/html.pm 2007-08-26 20:14:28 UTC (rev 24678) @@ -199,17 +199,16 @@ } 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 @@ { 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($$)