diff options
Diffstat (limited to 'source4/selftest/output')
-rw-r--r-- | source4/selftest/output/buildfarm.pm | 11 | ||||
-rw-r--r-- | source4/selftest/output/html.pm | 11 | ||||
-rw-r--r-- | source4/selftest/output/plain.pm | 11 |
3 files changed, 6 insertions, 27 deletions
diff --git a/source4/selftest/output/buildfarm.pm b/source4/selftest/output/buildfarm.pm index efb1e3ef5b..b5971e47ad 100644 --- a/source4/selftest/output/buildfarm.pm +++ b/source4/selftest/output/buildfarm.pm @@ -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; diff --git a/source4/selftest/output/html.pm b/source4/selftest/output/html.pm index fbf433e8d1..b8ee60edf7 100644 --- a/source4/selftest/output/html.pm +++ b/source4/selftest/output/html.pm @@ -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; diff --git a/source4/selftest/output/plain.pm b/source4/selftest/output/plain.pm index e4abb2d05a..0f70c6085e 100644 --- a/source4/selftest/output/plain.pm +++ b/source4/selftest/output/plain.pm @@ -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"; |