From e690c56ab7180f135ba0e67a24f53282c3f0d144 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 26 Oct 2007 21:15:04 +0200
Subject: r25741: Simplify calls to Subunit functions. (This used to be commit
 e42de5d8346a12c3fcdb8f9af1efa650c368a442)

---
 source4/selftest/output/buildfarm.pm | 11 ++---------
 source4/selftest/output/html.pm      | 11 ++---------
 source4/selftest/output/plain.pm     | 11 ++---------
 3 files changed, 6 insertions(+), 27 deletions(-)

(limited to 'source4/selftest/output')

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";
-- 
cgit