summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-08-31 13:24:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:03:16 -0500
commit51cdf8bc042835edbf8d08bd729193fab9bd5b35 (patch)
tree2b863c5285e82da7622ab539961ce16d3624779b /source4
parent6f9ea168a65916dd74f10ddfcec3b6a79f610492 (diff)
downloadsamba-51cdf8bc042835edbf8d08bd729193fab9bd5b35.tar.gz
samba-51cdf8bc042835edbf8d08bd729193fab9bd5b35.tar.bz2
samba-51cdf8bc042835edbf8d08bd729193fab9bd5b35.zip
r24834: Pass environment name on to skip_testsuite().
(This used to be commit 2ac1f32506c9fdfbe836f605b2152a9e094dc733)
Diffstat (limited to 'source4')
-rw-r--r--source4/selftest/output/buildfarm.pm4
-rw-r--r--source4/selftest/output/html.pm7
-rw-r--r--source4/selftest/output/plain.pm4
-rwxr-xr-xsource4/selftest/selftest.pl2
4 files changed, 9 insertions, 8 deletions
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 "</tr>\n";
}
-sub skip_testsuite($$)
+sub skip_testsuite($$$)
{
- my ($self, $name) = @_;
+ my ($self, $envname, $name) = @_;
print INDEX "<tr>\n";
print INDEX " <td class=\"testSuite\">$name</td>\n";
- print INDEX " <td class=\"resultSkipped\" colspan=\"2\">SKIPPED</td>\n";
+ print INDEX " <td class=\"environment\">$envname</td>\n";
+ print INDEX " <td class=\"resultSkipped\">SKIPPED</td>\n";
print INDEX "</tr>\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;
}