sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

r25764: Fix total number of tests count to not include skipped tests.

Browse Source 
(This used to be commit d90b058cd48d8b08bb0a0cd6e97ad95062f8259e)
This commit is contained in:
Jelmer Vernooij 2007-10-31 14:48:48 +01:00 committed by Stefan Metzmacher
parent 3c5a71f7e5
commit 7267b35058
2 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source4/selftest/output/html.pm
View File

@ -256,7 +256,6 @@ sub summary($)
my $st = $self->{statistics}; my $st = $self->{statistics};
print INDEX "<tr>\n"; print INDEX "<tr>\n";
print INDEX " <td class=\"testSuiteTotal\">Total</td>\n"; print INDEX " <td class=\"testSuiteTotal\">Total</td>\n";
print INDEX " <td></td>\n";
if ($st->{SUITES_FAIL} == 0) { if ($st->{SUITES_FAIL} == 0) {
print INDEX " <td class=\"resultOk\">"; print INDEX " <td class=\"resultOk\">";
@ -333,9 +332,9 @@ sub summary($)
foreach (@{$summ->{skip_testsuites}}) { foreach (@{$summ->{skip_testsuites}}) {
print SUMMARY "<tr>\n"; print SUMMARY "<tr>\n";
print SUMMARY " <td>$$_[1]</td>\n"; print SUMMARY " <td>$$_[0]</td>\n";
if (defined($$_[2])) { if (defined($$_[1])) {
print SUMMARY " <td>$$_[2]</td>\n"; print SUMMARY " <td>$$_[1]</td>\n";
} else { } else {
print SUMMARY " <td></td>\n"; print SUMMARY " <td></td>\n";
} }

60
source4/selftest/selftest.pl
View File

@ -203,15 +203,7 @@ sub skip($)
{ {
my ($name) = @_; my ($name) = @_;
my $reason = find_in_list(\@excludes, $name); return find_in_list(\@excludes, $name);
return $reason if $reason;
return undef unless ($#includes > -1);
return "not included" if (not find_in_list(\@includes, $name));
return undef;
} }
sub getlog_env($); sub getlog_env($);
@ -611,8 +603,33 @@ if ($#testlists == -1) {
die("No testlists specified"); die("No testlists specified");
} }
foreach (@testlists) { my $msg_ops;
push(@todo, read_testlist($_)); if ($opt_format eq "buildfarm") {
require output::buildfarm;
$msg_ops = new output::buildfarm($statistics);
} elsif ($opt_format eq "plain") {
require output::plain;
$msg_ops = new output::plain("$prefix/summary", $opt_verbose, $opt_immediate, $statistics);
} elsif ($opt_format eq "html") {
require output::html;
mkdir("test-results", 0777);
$msg_ops = new output::html("test-results", $statistics);
} else {
die("Invalid output format '$opt_format'");
}
foreach my $fn (@testlists) {
foreach (read_testlist($fn)) {
my $name = $$_[0];
next if (@includes and not find_in_list(\@includes, $name));
my $skipreason = skip($name);
if ($skipreason) {
$msg_ops->skip_testsuite($name, $skipreason);
$statistics->{SUITES_SKIPPED}++;
} else {
push(@todo, $_);
}
}
} }
if ($#todo == -1) { if ($#todo == -1) {
@ -730,20 +747,6 @@ sub teardown_env($)
delete $running_envs{$envname}; delete $running_envs{$envname};
} }
my $msg_ops;
if ($opt_format eq "buildfarm") {
require output::buildfarm;
$msg_ops = new output::buildfarm($statistics);
} elsif ($opt_format eq "plain") {
require output::plain;
$msg_ops = new output::plain("$prefix/summary", $opt_verbose, $opt_immediate, $statistics);
} elsif ($opt_format eq "html") {
require output::html;
mkdir("test-results", 0777);
$msg_ops = new output::html("test-results", $statistics);
} else {
die("Invalid output format '$opt_format'");
}
if ($opt_no_lazy_setup) { if ($opt_no_lazy_setup) {
setup_env($_) foreach (keys %required_envs); setup_env($_) foreach (keys %required_envs);
@ -781,13 +784,6 @@ $envvarstr
my $name = $$_[0]; my $name = $$_[0];
my $envname = $$_[1]; my $envname = $$_[1];
my $skipreason = skip($name);
if ($skipreason) {
$msg_ops->skip_testsuite($name, $skipreason);
$statistics->{SUITES_SKIPPED}++;
next;
}
my $envvars = setup_env($envname); my $envvars = setup_env($envname);
if (not defined($envvars)) { if (not defined($envvars)) {
$statistics->{SUITES_SKIPPED}++; $statistics->{SUITES_SKIPPED}++;