r24834: Pass environment name on to skip_testsuite().

(This used to be commit 2ac1f32506c9fdfbe836f605b2152a9e094dc733)

diff --git a/source4/selftest/output/buildfarm.pm b/source4/selftest/output/buildfarm.pm
index 7d6c3a987aed03c62587403af73d3a50d909b3b8..d35fe9f25047dd4109c43d2bed1c214762f40cca 100644 (file)
--- 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 156b5b98c7e212749883694b3f8d649de75dd6ea..79775961c0e3be172a01f074888b8af4008a1f7f 100644 (file)
--- 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 10d6eee215745f6b7706e78275384367c0fd24e0..736a138b079decd2c862ed4ea992086de8ef2c4f 100644 (file)
--- 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 3f8a74f7bcfd7e0e900e19a7c4852f866993af9f..2c8883037c647449330f0c67067be3bfa4a14555 100755 (executable)
--- 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;
                }