From 51cdf8bc042835edbf8d08bd729193fab9bd5b35 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 31 Aug 2007 13:24:59 +0000 Subject: r24834: Pass environment name on to skip_testsuite(). (This used to be commit 2ac1f32506c9fdfbe836f605b2152a9e094dc733) --- source4/selftest/output/buildfarm.pm | 4 ++-- source4/selftest/output/html.pm | 7 ++++--- source4/selftest/output/plain.pm | 4 ++-- source4/selftest/selftest.pl | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) (limited to 'source4') diff --git a/source4/selftest/output/buildfarm.pm b/source4/selftest/output/buildfarm.pm index 7d6c3a987a..d35fe9f250 100644 --- a/source4/selftest/output/buildfarm.pm +++ b/source4/selftest/output/buildfarm.pm @@ -99,9 +99,9 @@ sub missing_env($$$) print "FAIL: $name (ENV[$envname] not available!)\n"; } -sub skip_testsuite($$) +sub skip_testsuite($$$) { - my ($self, $name) = @_; + my ($self, $envname, $name) = @_; print "SKIPPED: $name\n"; } diff --git a/source4/selftest/output/html.pm b/source4/selftest/output/html.pm index 156b5b98c7..79775961c0 100644 --- a/source4/selftest/output/html.pm +++ b/source4/selftest/output/html.pm @@ -312,13 +312,14 @@ sub missing_env($$$) print INDEX "\n"; } -sub skip_testsuite($$) +sub skip_testsuite($$$) { - my ($self, $name) = @_; + my ($self, $envname, $name) = @_; print INDEX "\n"; print INDEX " $name\n"; - print INDEX " SKIPPED\n"; + print INDEX " $envname\n"; + print INDEX " SKIPPED\n"; print INDEX "\n"; } diff --git a/source4/selftest/output/plain.pm b/source4/selftest/output/plain.pm index 10d6eee215..736a138b07 100644 --- a/source4/selftest/output/plain.pm +++ b/source4/selftest/output/plain.pm @@ -111,9 +111,9 @@ sub missing_env($$$) print "FAIL: $name (ENV[$envname] not available!)\n"; } -sub skip_testsuite($$) +sub skip_testsuite($$$) { - my ($self, $name) = @_; + my ($self, $envname, $name) = @_; print "SKIPPED: $name\n"; } diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl index 3f8a74f7bc..2c8883037c 100755 --- a/source4/selftest/selftest.pl +++ b/source4/selftest/selftest.pl @@ -697,7 +697,7 @@ $envvarstr my $envname = $$_[1]; if (skip($name)) { - $msg_ops->skip_testsuite($name); + $msg_ops->skip_testsuite($envname, $name); $statistics->{SUITES_SKIPPED}++; next; } -- cgit