sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

r25741: Simplify calls to Subunit functions.

Browse Source 
(This used to be commit e42de5d8346a12c3fcdb8f9af1efa650c368a442)
This commit is contained in:
Jelmer Vernooij 2007-10-26 21:15:04 +02:00 committed by Stefan Metzmacher
parent 90964021eb
commit e690c56ab7
4 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source4/selftest/output/buildfarm.pm
View File

@ -97,18 +97,11 @@ sub summary($)
my ($self) = @_;
}
sub missing_env($$$)
{
my ($self, $name, $envname) = @_;
print "FAIL: $name (ENV[$envname] not available!)\n";
}
sub skip_testsuite($$$$)
{
my ($self, $envname, $name, $reason) = @_;
my ($self, $name, $reason) = @_;
# Ignore skipped tests
print "SKIPPED: $name\n";
}
1;

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

@ -349,19 +349,12 @@ sub summary($)
close(SUMMARY);
}
sub missing_env($$$)
{
my ($self, $name, $envname) = @_;
$self->skip_testsuite($envname, $name, "environment `$envname` not available!");
}
sub skip_testsuite($$$$)
{
my ($self, $envname, $name, $reason) = @_;
my ($self, $name, $reason) = @_;
push (@{$self->{error_summary}->{skip_testsuites}},
[$envname, $name, $reason]);
[$name, $reason]);
}
1;

11
source4/selftest/output/plain.pm
View File

@ -120,16 +120,9 @@ sub summary($)
}
}
sub missing_env($$$)
sub skip_testsuite($$)
{
my ($self, $name, $envname) = @_;
print "FAIL: $name (ENV[$envname] not available!)\n";
}
sub skip_testsuite($$$)
{
my ($self, $envname, $name, $reason) = @_;
my ($self, $name, $reason) = @_;
if ($reason) {
print "SKIPPED: $name [$reason]\n";

10
source4/selftest/selftest.pl
View File

@ -470,10 +470,10 @@ sub read_test_regexes($)
open(LF, "<$name") or die("unable to read $name: $!");
while (<LF>) {
chomp;
if (/^(.*?)([ \t]+)\#(.*)$/) {
push (@ret, [$1, $3]);
if (/^(.*?)([ \t]+)\#([\t ]*)(.*?)$/) {
push (@ret, [$1, $4]);
} else {
s/^(.*?)([ \t]+)\#(.*)$//;
s/^(.*?)([ \t]+)\#([\t ]*)(.*?)$//;
push (@ret, [$_, undef]);
}
}
@ -783,7 +783,7 @@ $envvarstr
my $skipreason = skip($name);
if ($skipreason) {
$msg_ops->skip_testsuite($envname, $name, $skipreason);
$msg_ops->skip_testsuite($name, $skipreason);
$statistics->{SUITES_SKIPPED}++;
next;
}
@ -791,7 +791,7 @@ $envvarstr
my $envvars = setup_env($envname);
if (not defined($envvars)) {
$statistics->{SUITES_SKIPPED}++;
$msg_ops->missing_env($name, $envname);
$msg_ops->skip_testsuite($name, "unable to set up environment $envname");
next;
}